speed-dreams
/
sdwebserver
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update CodeIgniter to 4.5.0

This commit is contained in:
Alfonso Saavedra "Son Link" 2024-04-07 22:17:30 +02:00
parent c644365a91
commit da15a23dd5
No known key found for this signature in database
GPG Key ID: D3594BCF897F74D8
46 changed files with 1614 additions and 1663 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

408
app/Config/App.php
View File

@ -11,51 +11,77 @@ class App extends BaseConfig
* Base Site URL * Base Site URL
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* *
* URL to your CodeIgniter root. Typically this will be your base URL, * URL to your CodeIgniter root. Typically, this will be your base URL,
* WITH a trailing slash: * WITH a trailing slash:
* *
* http://example.com/ * E.g., 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/'; public string $baseURL = 'http://sdmasterserver.soon.it/';
/**
* Allowed Hostnames in the Site URL other than the hostname in the baseURL.
* If you want to accept multiple Hostnames, set this.
*
* E.g.,
* When your site URL ($baseURL) is 'http://example.com/', and your site
* also accepts 'http://media.example.com/' and 'http://accounts.example.com/':
* ['media.example.com', 'accounts.example.com']
*
* @var list<string>
*/
public array $allowedHostnames = [];
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* Index File * Index File
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* *
* Typically this will be your index.php file, unless you've renamed it to * 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 * something else. If you have configured your web server to remove this file
* variable so that it is blank. * from your site URIs, set this variable to an empty string.
*
* @var string
*/ */
public $indexPage = ''; public string $indexPage = '';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* URI PROTOCOL * URI PROTOCOL
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* *
* This item determines which getServer global should be used to retrieve the * This item determines which server global should be used to retrieve the
* URI string. The default setting of 'REQUEST_URI' works for most servers. * 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: * If your links do not seem to work, try one of the other delicious flavors:
* *
* 'REQUEST_URI' Uses $_SERVER['REQUEST_URI'] * 'REQUEST_URI': Uses $_SERVER['REQUEST_URI']
* 'QUERY_STRING' Uses $_SERVER['QUERY_STRING'] * 'QUERY_STRING': Uses $_SERVER['QUERY_STRING']
* 'PATH_INFO' Uses $_SERVER['PATH_INFO'] * 'PATH_INFO': Uses $_SERVER['PATH_INFO']
* *
* WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded! * WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
*
* @var string
*/ */
public $uriProtocol = 'REQUEST_URI'; public string $uriProtocol = 'REQUEST_URI';
/*
|--------------------------------------------------------------------------
| Allowed URL Characters
|--------------------------------------------------------------------------
|
| This lets you specify which characters are permitted within your URLs.
| When someone tries to submit a URL with disallowed characters they will
| get a warning message.
|
| As a security measure you are STRONGLY encouraged to restrict URLs to
| as few characters as possible.
|
| By default, only these are allowed: `a-z 0-9~%.:_-`
|
| Set an empty string to allow all characters -- but only if you are insane.
|
| The configured value is actually a regular expression character group
| and it will be used as: '/\A[<permittedURIChars>]+\z/iu'
|
| DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
|
*/
public string $permittedURIChars = 'a-z 0-9~%.:_\-';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -66,10 +92,8 @@ class App extends BaseConfig
* is viewing the site from. It affects the language strings and other * is viewing the site from. It affects the language strings and other
* strings (like currency markers, numbers, etc), that your program * strings (like currency markers, numbers, etc), that your program
* should run under for this request. * should run under for this request.
*
* @var string
*/ */
public $defaultLocale = 'en'; public string $defaultLocale = 'en';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -80,10 +104,8 @@ class App extends BaseConfig
* language to use based on the value of the Accept-Language header. * language to use based on the value of the Accept-Language header.
* *
* If false, no automatic detection will be performed. * If false, no automatic detection will be performed.
*
* @var bool
*/ */
public $negotiateLocale = false; public bool $negotiateLocale = false;
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -94,9 +116,11 @@ class App extends BaseConfig
* by the application in descending order of priority. If no match is * by the application in descending order of priority. If no match is
* found, the first locale will be used. * found, the first locale will be used.
* *
* @var string[] * IncomingRequest::setLocale() also uses this list.
*
* @var list<string>
*/ */
public $supportedLocales = ['en']; public array $supportedLocales = ['en'];
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -106,9 +130,10 @@ class App extends BaseConfig
* The default timezone that will be used in your application to display * The default timezone that will be used in your application to display
* dates with the date helper, and can be retrieved through app_timezone() * dates with the date helper, and can be retrieved through app_timezone()
* *
* @var string * @see https://www.php.net/manual/en/timezones.php for list of timezones
* supported by PHP.
*/ */
public $appTimezone = 'Europe/Madrid'; public string $appTimezone = 'Europe/Madrid';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -119,210 +144,20 @@ class App extends BaseConfig
* that require a character set to be provided. * that require a character set to be provided.
* *
* @see http://php.net/htmlspecialchars for a list of supported charsets. * @see http://php.net/htmlspecialchars for a list of supported charsets.
*
* @var string
*/ */
public $charset = 'UTF-8'; public string $charset = 'UTF-8';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* URI PROTOCOL * Force Global Secure Requests
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* *
* If true, this will force every request made to this application to be * 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 * 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 * secure, the user will be redirected to a secure version of the page
* and the HTTP Strict Transport Security header will be set. * and the HTTP Strict Transport Security (HSTS) header will be set.
*
* @var bool
*/ */
public $forceGlobalSecureRequests = false; public bool $forceGlobalSecureRequests = false;
/**
* --------------------------------------------------------------------------
* Session Driver
* --------------------------------------------------------------------------
*
* The session storage driver to use:
* - `CodeIgniter\Session\Handlers\FileHandler`
* - `CodeIgniter\Session\Handlers\DatabaseHandler`
* - `CodeIgniter\Session\Handlers\MemcachedHandler`
* - `CodeIgniter\Session\Handlers\RedisHandler`
*
* @var string
*/
public $sessionDriver = 'CodeIgniter\Session\Handlers\FileHandler';
/**
* --------------------------------------------------------------------------
* Session Cookie Name
* --------------------------------------------------------------------------
*
* The session cookie name, must contain only [0-9a-z_-] characters
*
* @var string
*/
public $sessionCookieName = 'ci_session';
/**
* --------------------------------------------------------------------------
* Session Expiration
* --------------------------------------------------------------------------
*
* The number of SECONDS you want the session to last.
* Setting to 0 (zero) means expire when the browser is closed.
*
* @var int
*/
public $sessionExpiration = 7200;
/**
* --------------------------------------------------------------------------
* Session Save Path
* --------------------------------------------------------------------------
*
* The location to save sessions to and is driver dependent.
*
* For the 'files' driver, it's a path to a writable directory.
* WARNING: Only absolute paths are supported!
*
* For the 'database' driver, it's a table name.
* Please read up the manual for the format with other session drivers.
*
* IMPORTANT: You are REQUIRED to set a valid save path!
*
* @var string
*/
public $sessionSavePath = WRITEPATH . 'session';
/**
* --------------------------------------------------------------------------
* Session Match IP
* --------------------------------------------------------------------------
*
* Whether to match the user's IP address when reading the session data.
*
* WARNING: If you're using the database driver, don't forget to update
* your session table's PRIMARY KEY when changing this setting.
*
* @var bool
*/
public $sessionMatchIP = false;
/**
* --------------------------------------------------------------------------
* Session Time to Update
* --------------------------------------------------------------------------
*
* How many seconds between CI regenerating the session ID.
*
* @var int
*/
public $sessionTimeToUpdate = 300;
/**
* --------------------------------------------------------------------------
* Session Regenerate Destroy
* --------------------------------------------------------------------------
*
* Whether to destroy session data associated with the old session ID
* when auto-regenerating the session ID. When set to FALSE, the data
* will be later deleted by the garbage collector.
*
* @var bool
*/
public $sessionRegenerateDestroy = false;
/**
* --------------------------------------------------------------------------
* Cookie Prefix
* --------------------------------------------------------------------------
*
* Set a cookie name prefix if you need to avoid collisions.
*
* @var string
*
* @deprecated use Config\Cookie::$prefix property instead.
*/
public $cookiePrefix = '';
/**
* --------------------------------------------------------------------------
* Cookie Domain
* --------------------------------------------------------------------------
*
* Set to `.your-domain.com` for site-wide cookies.
*
* @var string
*
* @deprecated use Config\Cookie::$domain property instead.
*/
public $cookieDomain = '';
/**
* --------------------------------------------------------------------------
* Cookie Path
* --------------------------------------------------------------------------
*
* Typically will be a forward slash.
*
* @var string
*
* @deprecated use Config\Cookie::$path property instead.
*/
public $cookiePath = '/';
/**
* --------------------------------------------------------------------------
* Cookie Secure
* --------------------------------------------------------------------------
*
* Cookie will only be set if a secure HTTPS connection exists.
*
* @var bool
*
* @deprecated use Config\Cookie::$secure property instead.
*/
public $cookieSecure = false;
/**
* --------------------------------------------------------------------------
* Cookie HttpOnly
* --------------------------------------------------------------------------
*
* Cookie will only be accessible via HTTP(S) (no JavaScript).
*
* @var bool
*
* @deprecated use Config\Cookie::$httponly property instead.
*/
public $cookieHTTPOnly = true;
/**
* --------------------------------------------------------------------------
* Cookie SameSite
* --------------------------------------------------------------------------
*
* Configure cookie SameSite setting. Allowed values are:
* - None
* - Lax
* - Strict
* - ''
*
* Alternatively, you can use the constant names:
* - `Cookie::SAMESITE_NONE`
* - `Cookie::SAMESITE_LAX`
* - `Cookie::SAMESITE_STRICT`
*
* Defaults to `Lax` for compatibility with modern browsers. Setting `''`
* (empty string) means default SameSite attribute set by browsers (`Lax`)
* will be set on cookies. If set to `None`, `$cookieSecure` must also be set.
*
* @var string
*
* @deprecated use Config\Cookie::$samesite property instead.
*/
public $cookieSameSite = 'Lax';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -331,116 +166,21 @@ class App extends BaseConfig
* *
* If your server is behind a reverse proxy, you must whitelist the proxy * If your server is behind a reverse proxy, you must whitelist the proxy
* IP addresses from which CodeIgniter should trust headers such as * IP addresses from which CodeIgniter should trust headers such as
* HTTP_X_FORWARDED_FOR and HTTP_CLIENT_IP in order to properly identify * X-Forwarded-For or Client-IP in order to properly identify
* the visitor's IP address. * the visitor's IP address.
* *
* You can use both an array or a comma-separated list of proxy addresses, * You need to set a proxy IP address or IP address with subnets and
* as well as specifying whole subnets. Here are a few examples: * the HTTP header for the client IP address.
* *
* Comma-separated: '10.0.1.200,192.168.5.0/24' * Here are some examples:
* Array: ['10.0.1.200', '192.168.5.0/24'] * [
* '10.0.1.200' => 'X-Forwarded-For',
* '192.168.5.0/24' => 'X-Real-IP',
* ]
* *
* @var string|string[] * @var array<string, string>
*/ */
public $proxyIPs = ''; public array $proxyIPs = [];
/**
* --------------------------------------------------------------------------
* CSRF Token Name
* --------------------------------------------------------------------------
*
* The token name.
*
* @deprecated Use `Config\Security` $tokenName property instead of using this property.
*
* @var string
*/
public $CSRFTokenName = 'csrf_test_name';
/**
* --------------------------------------------------------------------------
* CSRF Header Name
* --------------------------------------------------------------------------
*
* The header name.
*
* @deprecated Use `Config\Security` $headerName property instead of using this property.
*
* @var string
*/
public $CSRFHeaderName = 'X-CSRF-TOKEN';
/**
* --------------------------------------------------------------------------
* CSRF Cookie Name
* --------------------------------------------------------------------------
*
* The cookie name.
*
* @deprecated Use `Config\Security` $cookieName property instead of using this property.
*
* @var string
*/
public $CSRFCookieName = 'csrf_cookie_name';
/**
* --------------------------------------------------------------------------
* CSRF Expire
* --------------------------------------------------------------------------
*
* The number in seconds the token should expire.
*
* @deprecated Use `Config\Security` $expire property instead of using this property.
*
* @var int
*/
public $CSRFExpire = 7200;
/**
* --------------------------------------------------------------------------
* CSRF Regenerate
* --------------------------------------------------------------------------
*
* Regenerate token on every submission?
*
* @deprecated Use `Config\Security` $regenerate property instead of using this property.
*
* @var bool
*/
public $CSRFRegenerate = true;
/**
* --------------------------------------------------------------------------
* CSRF Redirect
* --------------------------------------------------------------------------
*
* Redirect to previous page with error on failure?
*
* @deprecated Use `Config\Security` $redirect property instead of using this property.
*
* @var bool
*/
public $CSRFRedirect = true;
/**
* --------------------------------------------------------------------------
* CSRF SameSite
* --------------------------------------------------------------------------
*
* Setting for CSRF SameSite cookie token. Allowed values are:
* - None
* - Lax
* - Strict
* - ''
*
* Defaults to `Lax` as recommended in this link:
*
* @see https://portswigger.net/web-security/csrf/samesite-cookies
* @deprecated Use `Config\Security` $samesite property instead of using this property.
*
* @var string
*/
public $CSRFSameSite = 'Lax';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -457,8 +197,6 @@ class App extends BaseConfig
* *
* @see http://www.html5rocks.com/en/tutorials/security/content-security-policy/ * @see http://www.html5rocks.com/en/tutorials/security/content-security-policy/
* @see http://www.w3.org/TR/CSP/ * @see http://www.w3.org/TR/CSP/
*
* @var bool
*/ */
public $CSPEnabled = false; public bool $CSPEnabled = false;
} }

43
app/Config/Autoload.php
View File

@ -14,6 +14,11 @@ use CodeIgniter\Config\AutoloadConfig;
* *
* NOTE: If you use an identical key in $psr4 or $classmap, then * NOTE: If you use an identical key in $psr4 or $classmap, then
* the values in this file will overwrite the framework's values. * the values in this file will overwrite the framework's values.
*
* NOTE: This class is required prior to Autoloader instantiation,
* and does not extend BaseConfig.
*
* @immutable
*/ */
class Autoload extends AutoloadConfig class Autoload extends AutoloadConfig
{ {
@ -25,24 +30,17 @@ class Autoload extends AutoloadConfig
* their location on the file system. These are used by the autoloader * their location on the file system. These are used by the autoloader
* to locate files the first time they have been instantiated. * to locate files the first time they have been instantiated.
* *
* The '/app' and '/system' directories are already mapped for you. * The 'Config' (APPPATH . 'Config') and 'CodeIgniter' (SYSTEMPATH) are
* you may change the name of the 'App' namespace if you wish, * already mapped for you.
*
* You may change the name of the 'App' namespace if you wish,
* but this should be done prior to creating any namespaced classes, * but this should be done prior to creating any namespaced classes,
* else you will need to modify all of those classes for this to work. * else you will need to modify all of those classes for this to work.
* *
* Prototype: * @var array<string, list<string>|string>
*```
* $psr4 = [
* 'CodeIgniter' => SYSTEMPATH,
* 'App' => APPPATH
* ];
*```
*
* @var array<string, string>
*/ */
public $psr4 = [ public $psr4 = [
APP_NAMESPACE => APPPATH, // For custom app namespace APP_NAMESPACE => APPPATH,
'Config' => APPPATH . 'Config',
]; ];
/** /**
@ -56,11 +54,9 @@ class Autoload extends AutoloadConfig
* were being autoloaded through a namespace. * were being autoloaded through a namespace.
* *
* Prototype: * Prototype:
*```
* $classmap = [ * $classmap = [
* 'MyClass' => '/path/to/class/file.php' * 'MyClass' => '/path/to/class/file.php'
* ]; * ];
*```
* *
* @var array<string, string> * @var array<string, string>
*/ */
@ -75,13 +71,24 @@ class Autoload extends AutoloadConfig
* or for loading functions. * or for loading functions.
* *
* Prototype: * Prototype:
* ```
* $files = [ * $files = [
* '/path/to/my/file.php', * '/path/to/my/file.php',
* ]; * ];
* ```
* *
* @var array<int, string> * @var list<string>
*/ */
public $files = []; public $files = [];
/**
* -------------------------------------------------------------------
* Helpers
* -------------------------------------------------------------------
* Prototype:
* $helpers = [
* 'form',
* ];
*
* @var list<string>
*/
public $helpers = [];
} }

4
app/Config/Boot/development.php
View File

@ -7,8 +7,10 @@
| In development, we want to show as many errors as possible to help | In development, we want to show as many errors as possible to help
| make sure they don't make it to production. And save us hours of | make sure they don't make it to production. And save us hours of
| painful debugging. | painful debugging.
|
| If you set 'display_errors' to '1', CI4's detailed error report will show.
*/ */
error_reporting(-1); error_reporting(E_ALL);
ini_set('display_errors', '1'); ini_set('display_errors', '1');
/* /*

6
app/Config/Boot/production.php
View File

@ -6,9 +6,13 @@
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Don't show ANY in production environments. Instead, let the system catch | Don't show ANY in production environments. Instead, let the system catch
| it and display a generic error message. | it and display a generic error message.
|
| If you set 'display_errors' to '1', CI4's detailed error report will show.
*/ */
error_reporting(E_ALL & ~E_DEPRECATED);
// If you want to suppress more types of errors.
// error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
ini_set('display_errors', '0'); ini_set('display_errors', '0');
error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

8
app/Config/Boot/testing.php
View File

@ -1,5 +1,11 @@
<?php <?php
/*
* The environment testing is reserved for PHPUnit testing. It has special
* conditions built into the framework at various places to assist with that.
* You can’t use it for your development.
*/
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| ERROR DISPLAY | ERROR DISPLAY
@ -8,7 +14,7 @@
| make sure they don't make it to production. And save us hours of | make sure they don't make it to production. And save us hours of
| painful debugging. | painful debugging.
*/ */
error_reporting(-1); error_reporting(E_ALL);
ini_set('display_errors', '1'); ini_set('display_errors', '1');
/* /*

4
app/Config/CURLRequest.php
View File

@ -15,8 +15,6 @@ class CURLRequest extends BaseConfig
* *
* If true, all the options won't be reset between requests. * If true, all the options won't be reset between requests.
* It may cause an error request with unnecessary headers. * It may cause an error request with unnecessary headers.
*
* @var bool
*/ */
public $shareOptions = true; public bool $shareOptions = false;
} }

76
app/Config/Cache.php
View File

@ -2,6 +2,7 @@
namespace Config; namespace Config;
use CodeIgniter\Cache\CacheInterface;
use CodeIgniter\Cache\Handlers\DummyHandler; use CodeIgniter\Cache\Handlers\DummyHandler;
use CodeIgniter\Cache\Handlers\FileHandler; use CodeIgniter\Cache\Handlers\FileHandler;
use CodeIgniter\Cache\Handlers\MemcachedHandler; use CodeIgniter\Cache\Handlers\MemcachedHandler;
@ -19,10 +20,8 @@ class Cache extends BaseConfig
* *
* The name of the preferred handler that should be used. If for some reason * The name of the preferred handler that should be used. If for some reason
* it is not available, the $backupHandler will be used in its place. * it is not available, the $backupHandler will be used in its place.
*
* @var string
*/ */
public $handler = 'file'; public string $handler = 'file';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -32,10 +31,8 @@ class Cache extends BaseConfig
* The name of the handler that will be used in case the first one is * The name of the handler that will be used in case the first one is
* unreachable. Often, 'file' is used here since the filesystem is * unreachable. Often, 'file' is used here since the filesystem is
* always available, though that's not always practical for the app. * always available, though that's not always practical for the app.
*
* @var string
*/ */
public $backupHandler = 'dummy'; public string $backupHandler = 'dummy';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -45,30 +42,9 @@ class Cache extends BaseConfig
* The path to where cache files should be stored, if using a file-based * The path to where cache files should be stored, if using a file-based
* system. * system.
* *
* @var string
*
* @deprecated Use the driver-specific variant under $file * @deprecated Use the driver-specific variant under $file
*/ */
public $storePath = WRITEPATH . 'cache/'; public string $storePath = WRITEPATH . 'cache/';
/**
* --------------------------------------------------------------------------
* Cache Include Query String
* --------------------------------------------------------------------------
*
* Whether to take the URL query string into consideration when generating
* output cache files. Valid options are:
*
* false = Disabled
* true = Enabled, take all query parameters into account.
* Please be aware that this may result in numerous cache
* files generated for the same page over and over again.
* array('q') = Enabled, but only take into account the specified list
* of query parameters.
*
* @var bool|string[]
*/
public $cacheQueryString = false;
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -77,10 +53,8 @@ class Cache extends BaseConfig
* *
* This string is added to all cache item names to help avoid collisions * This string is added to all cache item names to help avoid collisions
* if you run multiple applications with the same cache engine. * if you run multiple applications with the same cache engine.
*
* @var string
*/ */
public $prefix = ''; public string $prefix = '';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -92,10 +66,8 @@ class Cache extends BaseConfig
* WARNING: This is not used by framework handlers where 60 seconds is * WARNING: This is not used by framework handlers where 60 seconds is
* hard-coded, but may be useful to projects and modules. This will replace * hard-coded, but may be useful to projects and modules. This will replace
* the hard-coded value in a future release. * the hard-coded value in a future release.
*
* @var int
*/ */
public $ttl = 60; public int $ttl = 60;
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -105,11 +77,10 @@ class Cache extends BaseConfig
* A string of reserved characters that will not be allowed in keys or tags. * A string of reserved characters that will not be allowed in keys or tags.
* Strings that violate this restriction will cause handlers to throw. * Strings that violate this restriction will cause handlers to throw.
* Default: {}()/\@: * Default: {}()/\@:
* Note: The default set is required for PSR-6 compliance.
* *
* @var string * NOTE: The default set is required for PSR-6 compliance.
*/ */
public $reservedCharacters = '{}()/\@:'; public string $reservedCharacters = '{}()/\@:';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -120,7 +91,7 @@ class Cache extends BaseConfig
* *
* @var array<string, int|string|null> * @var array<string, int|string|null>
*/ */
public $file = [ public array $file = [
'storePath' => WRITEPATH . 'cache/', 'storePath' => WRITEPATH . 'cache/',
'mode' => 0640, 'mode' => 0640,
]; ];
@ -134,9 +105,9 @@ class Cache extends BaseConfig
* *
* @see https://codeigniter.com/user_guide/libraries/caching.html#memcached * @see https://codeigniter.com/user_guide/libraries/caching.html#memcached
* *
* @var array<string, boolean|int|string> * @var array<string, bool|int|string>
*/ */
public $memcached = [ public array $memcached = [
'host' => '127.0.0.1', 'host' => '127.0.0.1',
'port' => 11211, 'port' => 11211,
'weight' => 1, 'weight' => 1,
@ -152,7 +123,7 @@ class Cache extends BaseConfig
* *
* @var array<string, int|string|null> * @var array<string, int|string|null>
*/ */
public $redis = [ public array $redis = [
'host' => '127.0.0.1', 'host' => '127.0.0.1',
'password' => null, 'password' => null,
'port' => 6379, 'port' => 6379,
@ -168,9 +139,9 @@ class Cache extends BaseConfig
* This is an array of cache engine alias' and class names. Only engines * This is an array of cache engine alias' and class names. Only engines
* that are listed here are allowed to be used. * that are listed here are allowed to be used.
* *
* @var array<string, string> * @var array<string, class-string<CacheInterface>>
*/ */
public $validHandlers = [ public array $validHandlers = [
'dummy' => DummyHandler::class, 'dummy' => DummyHandler::class,
'file' => FileHandler::class, 'file' => FileHandler::class,
'memcached' => MemcachedHandler::class, 'memcached' => MemcachedHandler::class,
@ -178,4 +149,23 @@ class Cache extends BaseConfig
'redis' => RedisHandler::class, 'redis' => RedisHandler::class,
'wincache' => WincacheHandler::class, 'wincache' => WincacheHandler::class,
]; ];
/**
* --------------------------------------------------------------------------
* Web Page Caching: Cache Include Query String
* --------------------------------------------------------------------------
*
* Whether to take the URL query string into consideration when generating
* output cache files. Valid options are:
*
* false = Disabled
* true = Enabled, take all query parameters into account.
* Please be aware that this may result in numerous cache
* files generated for the same page over and over again.
* ['q'] = Enabled, but only take into account the specified list
* of query parameters.
*
* @var bool|list<string>
*/
public $cacheQueryString = false;
} }

21
app/Config/Constants.php
View File

@ -38,9 +38,9 @@ defined('MINUTE') || define('MINUTE', 60);
defined('HOUR') || define('HOUR', 3600); defined('HOUR') || define('HOUR', 3600);
defined('DAY') || define('DAY', 86400); defined('DAY') || define('DAY', 86400);
defined('WEEK') || define('WEEK', 604800); defined('WEEK') || define('WEEK', 604800);
defined('MONTH') || define('MONTH', 2592000); defined('MONTH') || define('MONTH', 2_592_000);
defined('YEAR') || define('YEAR', 31536000); defined('YEAR') || define('YEAR', 31_536_000);
defined('DECADE') || define('DECADE', 315360000); defined('DECADE') || define('DECADE', 315_360_000);
/* /*
| -------------------------------------------------------------------------- | --------------------------------------------------------------------------
@ -77,3 +77,18 @@ defined('EXIT_USER_INPUT') || define('EXIT_USER_INPUT', 7); // invalid user
defined('EXIT_DATABASE') || define('EXIT_DATABASE', 8); // database error defined('EXIT_DATABASE') || define('EXIT_DATABASE', 8); // database error
defined('EXIT__AUTO_MIN') || define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code defined('EXIT__AUTO_MIN') || define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
defined('EXIT__AUTO_MAX') || define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code defined('EXIT__AUTO_MAX') || define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
/**
* @deprecated Use \CodeIgniter\Events\Events::PRIORITY_LOW instead.
*/
define('EVENT_PRIORITY_LOW', 200);
/**
* @deprecated Use \CodeIgniter\Events\Events::PRIORITY_NORMAL instead.
*/
define('EVENT_PRIORITY_NORMAL', 100);
/**
* @deprecated Use \CodeIgniter\Events\Events::PRIORITY_HIGH instead.
*/
define('EVENT_PRIORITY_HIGH', 10);

69
app/Config/ContentSecurityPolicy.php
View File

@ -15,64 +15,58 @@ use CodeIgniter\Config\BaseConfig;
*/ */
class ContentSecurityPolicy extends BaseConfig class ContentSecurityPolicy extends BaseConfig
{ {
//------------------------------------------------------------------------- // -------------------------------------------------------------------------
// Broadbrush CSP management // Broadbrush CSP management
//------------------------------------------------------------------------- // -------------------------------------------------------------------------
/** /**
* Default CSP report context * Default CSP report context
*
* @var bool
*/ */
public $reportOnly = false; public bool $reportOnly = false;
/** /**
* Specifies a URL where a browser will send reports * Specifies a URL where a browser will send reports
* when a content security policy is violated. * when a content security policy is violated.
*
* @var string|null
*/ */
public $reportURI; public ?string $reportURI = null;
/** /**
* Instructs user agents to rewrite URL schemes, changing * Instructs user agents to rewrite URL schemes, changing
* HTTP to HTTPS. This directive is for websites with * HTTP to HTTPS. This directive is for websites with
* large numbers of old URLs that need to be rewritten. * large numbers of old URLs that need to be rewritten.
*
* @var bool
*/ */
public $upgradeInsecureRequests = false; public bool $upgradeInsecureRequests = false;
//------------------------------------------------------------------------- // -------------------------------------------------------------------------
// Sources allowed // Sources allowed
// Note: once you set a policy to 'none', it cannot be further restricted // NOTE: once you set a policy to 'none', it cannot be further restricted
//------------------------------------------------------------------------- // -------------------------------------------------------------------------
/** /**
* Will default to self if not overridden * Will default to self if not overridden
* *
* @var string|string[]|null * @var list<string>|string|null
*/ */
public $defaultSrc; public $defaultSrc;
/** /**
* Lists allowed scripts' URLs. * Lists allowed scripts' URLs.
* *
* @var string|string[] * @var list<string>|string
*/ */
public $scriptSrc = 'self'; public $scriptSrc = 'self';
/** /**
* Lists allowed stylesheets' URLs. * Lists allowed stylesheets' URLs.
* *
* @var string|string[] * @var list<string>|string
*/ */
public $styleSrc = 'self'; public $styleSrc = 'self';
/** /**
* Defines the origins from which images can be loaded. * Defines the origins from which images can be loaded.
* *
* @var string|string[] * @var list<string>|string
*/ */
public $imageSrc = 'self'; public $imageSrc = 'self';
@ -81,14 +75,14 @@ class ContentSecurityPolicy extends BaseConfig
* *
* Will default to self if not overridden * Will default to self if not overridden
* *
* @var string|string[]|null * @var list<string>|string|null
*/ */
public $baseURI; public $baseURI;
/** /**
* Lists the URLs for workers and embedded frame contents * Lists the URLs for workers and embedded frame contents
* *
* @var string|string[] * @var list<string>|string
*/ */
public $childSrc = 'self'; public $childSrc = 'self';
@ -96,21 +90,21 @@ class ContentSecurityPolicy extends BaseConfig
* Limits the origins that you can connect to (via XHR, * Limits the origins that you can connect to (via XHR,
* WebSockets, and EventSource). * WebSockets, and EventSource).
* *
* @var string|string[] * @var list<string>|string
*/ */
public $connectSrc = 'self'; public $connectSrc = 'self';
/** /**
* Specifies the origins that can serve web fonts. * Specifies the origins that can serve web fonts.
* *
* @var string|string[] * @var list<string>|string
*/ */
public $fontSrc; public $fontSrc;
/** /**
* Lists valid endpoints for submission from `<form>` tags. * Lists valid endpoints for submission from `<form>` tags.
* *
* @var string|string[] * @var list<string>|string
*/ */
public $formAction = 'self'; public $formAction = 'self';
@ -120,7 +114,7 @@ class ContentSecurityPolicy extends BaseConfig
* and `<applet>` tags. This directive can't be used in * and `<applet>` tags. This directive can't be used in
* `<meta>` tags and applies only to non-HTML resources. * `<meta>` tags and applies only to non-HTML resources.
* *
* @var string|string[]|null * @var list<string>|string|null
*/ */
public $frameAncestors; public $frameAncestors;
@ -128,40 +122,55 @@ class ContentSecurityPolicy extends BaseConfig
* The frame-src directive restricts the URLs which may * The frame-src directive restricts the URLs which may
* be loaded into nested browsing contexts. * be loaded into nested browsing contexts.
* *
* @var array|string|null * @var list<string>|string|null
*/ */
public $frameSrc; public $frameSrc;
/** /**
* Restricts the origins allowed to deliver video and audio. * Restricts the origins allowed to deliver video and audio.
* *
* @var string|string[]|null * @var list<string>|string|null
*/ */
public $mediaSrc; public $mediaSrc;
/** /**
* Allows control over Flash and other plugins. * Allows control over Flash and other plugins.
* *
* @var string|string[] * @var list<string>|string
*/ */
public $objectSrc = 'self'; public $objectSrc = 'self';
/** /**
* @var string|string[]|null * @var list<string>|string|null
*/ */
public $manifestSrc; public $manifestSrc;
/** /**
* Limits the kinds of plugins a page may invoke. * Limits the kinds of plugins a page may invoke.
* *
* @var string|string[]|null * @var list<string>|string|null
*/ */
public $pluginTypes; public $pluginTypes;
/** /**
* List of actions allowed. * List of actions allowed.
* *
* @var string|string[]|null * @var list<string>|string|null
*/ */
public $sandbox; public $sandbox;
/**
* Nonce tag for style
*/
public string $styleNonceTag = '{csp-style-nonce}';
/**
* Nonce tag for script
*/
public string $scriptNonceTag = '{csp-script-nonce}';
/**
* Replace nonce tag automatically
*/
public bool $autoNonce = true;
} }

28
app/Config/Cookie.php
View File

@ -13,10 +13,8 @@ class Cookie extends BaseConfig
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* *
* Set a cookie name prefix if you need to avoid collisions. * Set a cookie name prefix if you need to avoid collisions.
*
* @var string
*/ */
public $prefix = ''; public string $prefix = '';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -37,10 +35,8 @@ class Cookie extends BaseConfig
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* *
* Typically will be a forward slash. * Typically will be a forward slash.
*
* @var string
*/ */
public $path = '/'; public string $path = '/';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -48,10 +44,8 @@ class Cookie extends BaseConfig
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* *
* Set to `.your-domain.com` for site-wide cookies. * Set to `.your-domain.com` for site-wide cookies.
*
* @var string
*/ */
public $domain = ''; public string $domain = '';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -59,10 +53,8 @@ class Cookie extends BaseConfig
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* *
* Cookie will only be set if a secure HTTPS connection exists. * Cookie will only be set if a secure HTTPS connection exists.
*
* @var bool
*/ */
public $secure = false; public bool $secure = false;
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -70,10 +62,8 @@ class Cookie extends BaseConfig
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* *
* Cookie will only be accessible via HTTP(S) (no JavaScript). * Cookie will only be accessible via HTTP(S) (no JavaScript).
*
* @var bool
*/ */
public $httponly = true; public bool $httponly = true;
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -95,9 +85,9 @@ class Cookie extends BaseConfig
* (empty string) means default SameSite attribute set by browsers (`Lax`) * (empty string) means default SameSite attribute set by browsers (`Lax`)
* will be set on cookies. If set to `None`, `$secure` must also be set. * will be set on cookies. If set to `None`, `$secure` must also be set.
* *
* @var string * @phpstan-var 'None'|'Lax'|'Strict'|''
*/ */
public $samesite = 'Lax'; public string $samesite = 'Lax';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -110,10 +100,8 @@ class Cookie extends BaseConfig
* If this is set to `true`, cookie names should be compliant of RFC 2616's * If this is set to `true`, cookie names should be compliant of RFC 2616's
* list of allowed characters. * list of allowed characters.
* *
* @var bool
*
* @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#attributes * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#attributes
* @see https://tools.ietf.org/html/rfc2616#section-2.2 * @see https://tools.ietf.org/html/rfc2616#section-2.2
*/ */
public $raw = false; public bool $raw = false;
} }

105
app/Config/Cors.php Normal file
View File

@ -0,0 +1,105 @@
<?php
namespace Config;
use CodeIgniter\Config\BaseConfig;
/**
* Cross-Origin Resource Sharing (CORS) Configuration
*
* @see https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
*/
class Cors extends BaseConfig
{
/**
* The default CORS configuration.
*
* @var array{
* allowedOrigins: list<string>,
* allowedOriginsPatterns: list<string>,
* supportsCredentials: bool,
* allowedHeaders: list<string>,
* exposedHeaders: list<string>,
* allowedMethods: list<string>,
* maxAge: int,
* }
*/
public array $default = [
/**
* Origins for the `Access-Control-Allow-Origin` header.
*
* @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin
*
* E.g.:
* - ['http://localhost:8080']
* - ['https://www.example.com']
*/
'allowedOrigins' => [],
/**
* Origin regex patterns for the `Access-Control-Allow-Origin` header.
*
* @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin
*
* NOTE: A pattern specified here is part of a regular expression. It will
* be actually `#\A<pattern>\z#`.
*
* E.g.:
* - ['https://\w+\.example\.com']
*/
'allowedOriginsPatterns' => [],
/**
* Weather to send the `Access-Control-Allow-Credentials` header.
*
* The Access-Control-Allow-Credentials response header tells browsers whether
* the server allows cross-origin HTTP requests to include credentials.
*
* @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Credentials
*/
'supportsCredentials' => false,
/**
* Set headers to allow.
*
* The Access-Control-Allow-Headers response header is used in response to
* a preflight request which includes the Access-Control-Request-Headers to
* indicate which HTTP headers can be used during the actual request.
*
* @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Headers
*/
'allowedHeaders' => [],
/**
* Set headers to expose.
*
* The Access-Control-Expose-Headers response header allows a server to
* indicate which response headers should be made available to scripts running
* in the browser, in response to a cross-origin request.
*
* @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Expose-Headers
*/
'exposedHeaders' => [],
/**
* Set methods to allow.
*
* The Access-Control-Allow-Methods response header specifies one or more
* methods allowed when accessing a resource in response to a preflight
* request.
*
* E.g.:
* - ['GET', 'POST', 'PUT', 'DELETE']
*
* @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Methods
*/
'allowedMethods' => [],
/**
* Set how many seconds the results of a preflight request can be cached.
*
* @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Max-Age
*/
'maxAge' => 7200,
];
}

150
app/Config/Database.php
View File

@ -10,36 +10,29 @@ use CodeIgniter\Database\Config;
class Database extends Config class Database extends Config
{ {
/** /**
* The directory that holds the Migrations * The directory that holds the Migrations and Seeds directories.
* and Seeds directories.
*
* @var string
*/ */
public $filesPath = APPPATH . 'Database' . DIRECTORY_SEPARATOR; public string $filesPath = APPPATH . 'Database' . DIRECTORY_SEPARATOR;
/** /**
* Lets you choose which connection group to * Lets you choose which connection group to use if no other is specified.
* use if no other is specified.
*
* @var string
*/ */
public $defaultGroup = 'default'; public string $defaultGroup = 'default';
/** /**
* The default database connection. * The default database connection.
* *
* @var array * @var array<string, mixed>
*/ */
public $default = [ public array $default = [
'DSN' => '', 'DSN' => '',
'hostname' => 'localhost', 'hostname' => 'localhost',
'username' => '', 'username' => '',
'password' => '', 'password' => '',
'database' => '', 'database' => '',
'DBDriver' => '', 'DBDriver' => 'MySQLi',
'DBPrefix' => '', 'DBPrefix' => '',
'pConnect' => false, 'pConnect' => false,
//'DBDebug' => (ENVIRONMENT !== 'production'),
'DBDebug' => true, 'DBDebug' => true,
'charset' => 'utf8', 'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci', 'DBCollat' => 'utf8_general_ci',
@ -49,15 +42,125 @@ class Database extends Config
'strictOn' => false, 'strictOn' => false,
'failover' => [], 'failover' => [],
'port' => 3306, 'port' => 3306,
'numberNative' => false,
'dateFormat' => [
'date' => 'Y-m-d',
'datetime' => 'Y-m-d H:i:s',
'time' => 'H:i:s',
],
]; ];
// /**
// * Sample database connection for SQLite3.
// *
// * @var array<string, mixed>
// */
// public array $default = [
// 'database' => 'database.db',
// 'DBDriver' => 'SQLite3',
// 'DBPrefix' => '',
// 'DBDebug' => true,
// 'swapPre' => '',
// 'failover' => [],
// 'foreignKeys' => true,
// 'busyTimeout' => 1000,
// 'dateFormat' => [
// 'date' => 'Y-m-d',
// 'datetime' => 'Y-m-d H:i:s',
// 'time' => 'H:i:s',
// ],
// ];
// /**
// * Sample database connection for Postgre.
// *
// * @var array<string, mixed>
// */
// public array $default = [
// 'DSN' => '',
// 'hostname' => 'localhost',
// 'username' => 'root',
// 'password' => 'root',
// 'database' => 'ci4',
// 'schema' => 'public',
// 'DBDriver' => 'Postgre',
// 'DBPrefix' => '',
// 'pConnect' => false,
// 'DBDebug' => true,
// 'charset' => 'utf8',
// 'swapPre' => '',
// 'failover' => [],
// 'port' => 5432,
// 'dateFormat' => [
// 'date' => 'Y-m-d',
// 'datetime' => 'Y-m-d H:i:s',
// 'time' => 'H:i:s',
// ],
// ];
// /**
// * Sample database connection for SQLSRV.
// *
// * @var array<string, mixed>
// */
// public array $default = [
// 'DSN' => '',
// 'hostname' => 'localhost',
// 'username' => 'root',
// 'password' => 'root',
// 'database' => 'ci4',
// 'schema' => 'dbo',
// 'DBDriver' => 'SQLSRV',
// 'DBPrefix' => '',
// 'pConnect' => false,
// 'DBDebug' => true,
// 'charset' => 'utf8',
// 'swapPre' => '',
// 'encrypt' => false,
// 'failover' => [],
// 'port' => 1433,
// 'dateFormat' => [
// 'date' => 'Y-m-d',
// 'datetime' => 'Y-m-d H:i:s',
// 'time' => 'H:i:s',
// ],
// ];
// /**
// * Sample database connection for OCI8.
// *
// * You may need the following environment variables:
// * NLS_LANG = 'AMERICAN_AMERICA.UTF8'
// * NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS'
// * NLS_TIMESTAMP_FORMAT = 'YYYY-MM-DD HH24:MI:SS'
// * NLS_TIMESTAMP_TZ_FORMAT = 'YYYY-MM-DD HH24:MI:SS'
// *
// * @var array<string, mixed>
// */
// public array $default = [
// 'DSN' => 'localhost:1521/XEPDB1',
// 'username' => 'root',
// 'password' => 'root',
// 'DBDriver' => 'OCI8',
// 'DBPrefix' => '',
// 'pConnect' => false,
// 'DBDebug' => true,
// 'charset' => 'AL32UTF8',
// 'swapPre' => '',
// 'failover' => [],
// 'dateFormat' => [
// 'date' => 'Y-m-d',
// 'datetime' => 'Y-m-d H:i:s',
// 'time' => 'H:i:s',
// ],
// ];
/** /**
* This database connection is used when * This database connection is used when running PHPUnit database tests.
* running PHPUnit database tests.
* *
* @var array * @var array<string, mixed>
*/ */
public $tests = [ public array $tests = [
'DSN' => '', 'DSN' => '',
'hostname' => '127.0.0.1', 'hostname' => '127.0.0.1',
'username' => '', 'username' => '',
@ -66,15 +169,22 @@ class Database extends Config
'DBDriver' => 'SQLite3', 'DBDriver' => 'SQLite3',
'DBPrefix' => 'db_', // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS 'DBPrefix' => 'db_', // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS
'pConnect' => false, 'pConnect' => false,
'DBDebug' => (ENVIRONMENT !== 'production'), 'DBDebug' => true,
'charset' => 'utf8', 'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci', 'DBCollat' => '',
'swapPre' => '', 'swapPre' => '',
'encrypt' => false, 'encrypt' => false,
'compress' => false, 'compress' => false,
'strictOn' => false, 'strictOn' => false,
'failover' => [], 'failover' => [],
'port' => 3306, 'port' => 3306,
'foreignKeys' => true,
'busyTimeout' => 1000,
'dateFormat' => [
'date' => 'Y-m-d',
'datetime' => 'Y-m-d H:i:s',
'time' => 'H:i:s',
],
]; ];
public function __construct() public function __construct()

15
app/Config/DocTypes.php Normal file → Executable file
View File

@ -2,6 +2,9 @@
namespace Config; namespace Config;
/**
* @immutable
*/
class DocTypes class DocTypes
{ {
/** /**
@ -9,7 +12,7 @@ class DocTypes
* *
* @var array<string, string> * @var array<string, string>
*/ */
public $list = [ public array $list = [
'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">', 'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
'xhtml1-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">', 'xhtml1-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
'xhtml1-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">', 'xhtml1-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
@ -30,4 +33,14 @@ class DocTypes
'xhtml-rdfa-1' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">', 'xhtml-rdfa-1' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
'xhtml-rdfa-2' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">', 'xhtml-rdfa-2' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">',
]; ];
/**
* Whether to remove the solidus (`/`) character for void HTML elements (e.g. `<input>`)
* for HTML5 compatibility.
*
* Set to:
* `true` - to be HTML5 compatible
* `false` - to be XHTML compatible
*/
public bool $html5 = true;
} }

107
app/Config/Email.php
View File

@ -6,165 +6,116 @@ use CodeIgniter\Config\BaseConfig;
class Email extends BaseConfig class Email extends BaseConfig
{ {
/** public string $fromEmail = '';
* @var string public string $fromName = '';
*/ public string $recipients = '';
public $fromEmail;
/**
* @var string
*/
public $fromName;
/**
* @var string
*/
public $recipients;
/** /**
* The "user agent" * The "user agent"
*
* @var string
*/ */
public $userAgent = 'CodeIgniter'; public string $userAgent = 'CodeIgniter';
/** /**
* The mail sending protocol: mail, sendmail, smtp * The mail sending protocol: mail, sendmail, smtp
*
* @var string
*/ */
public $protocol = 'mail'; public string $protocol = 'mail';
/** /**
* The server path to Sendmail. * The server path to Sendmail.
*
* @var string
*/ */
public $mailPath = '/usr/sbin/sendmail'; public string $mailPath = '/usr/sbin/sendmail';
/** /**
* SMTP Server Address * SMTP Server Hostname
*
* @var string
*/ */
public $SMTPHost; public string $SMTPHost = '';
/** /**
* SMTP Username * SMTP Username
*
* @var string
*/ */
public $SMTPUser; public string $SMTPUser = '';
/** /**
* SMTP Password * SMTP Password
*
* @var string
*/ */
public $SMTPPass; public string $SMTPPass = '';
/** /**
* SMTP Port * SMTP Port
*
* @var int
*/ */
public $SMTPPort = 25; public int $SMTPPort = 25;
/** /**
* SMTP Timeout (in seconds) * SMTP Timeout (in seconds)
*
* @var int
*/ */
public $SMTPTimeout = 5; public int $SMTPTimeout = 5;
/** /**
* Enable persistent SMTP connections * Enable persistent SMTP connections
*
* @var bool
*/ */
public $SMTPKeepAlive = false; public bool $SMTPKeepAlive = false;
/** /**
* SMTP Encryption. Either tls or ssl * SMTP Encryption.
* *
* @var string * @var string '', 'tls' or 'ssl'. 'tls' will issue a STARTTLS command
* to the server. 'ssl' means implicit SSL. Connection on port
* 465 should set this to ''.
*/ */
public $SMTPCrypto = 'tls'; public string $SMTPCrypto = 'tls';
/** /**
* Enable word-wrap * Enable word-wrap
*
* @var bool
*/ */
public $wordWrap = true; public bool $wordWrap = true;
/** /**
* Character count to wrap at * Character count to wrap at
*
* @var int
*/ */
public $wrapChars = 76; public int $wrapChars = 76;
/** /**
* Type of mail, either 'text' or 'html' * Type of mail, either 'text' or 'html'
*
* @var string
*/ */
public $mailType = 'text'; public string $mailType = 'text';
/** /**
* Character set (utf-8, iso-8859-1, etc.) * Character set (utf-8, iso-8859-1, etc.)
*
* @var string
*/ */
public $charset = 'UTF-8'; public string $charset = 'UTF-8';
/** /**
* Whether to validate the email address * Whether to validate the email address
*
* @var bool
*/ */
public $validate = false; public bool $validate = false;
/** /**
* Email Priority. 1 = highest. 5 = lowest. 3 = normal * Email Priority. 1 = highest. 5 = lowest. 3 = normal
*
* @var int
*/ */
public $priority = 3; public int $priority = 3;
/** /**
* Newline character. (Use “\r\n” to comply with RFC 822) * Newline character. (Use “\r\n” to comply with RFC 822)
*
* @var string
*/ */
public $CRLF = "\r\n"; public string $CRLF = "\r\n";
/** /**
* Newline character. (Use “\r\n” to comply with RFC 822) * Newline character. (Use “\r\n” to comply with RFC 822)
*
* @var string
*/ */
public $newline = "\r\n"; public string $newline = "\r\n";
/** /**
* Enable BCC Batch Mode. * Enable BCC Batch Mode.
*
* @var bool
*/ */
public $BCCBatchMode = false; public bool $BCCBatchMode = false;
/** /**
* Number of emails in each BCC batch * Number of emails in each BCC batch
*
* @var int
*/ */
public $BCCBatchSize = 200; public int $BCCBatchSize = 200;
/** /**
* Enable notify message from server * Enable notify message from server
*
* @var bool
*/ */
public $DSN = false; public bool $DSN = false;
} }

49
app/Config/Encryption.php
View File

@ -20,10 +20,8 @@ class Encryption extends BaseConfig
* If you use the Encryption class you must set an encryption key (seed). * If you use the Encryption class you must set an encryption key (seed).
* You need to ensure it is long enough for the cipher and mode you plan to use. * You need to ensure it is long enough for the cipher and mode you plan to use.
* See the user guide for more info. * See the user guide for more info.
*
* @var string
*/ */
public $key = ''; public string $key = '';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -35,10 +33,8 @@ class Encryption extends BaseConfig
* Available drivers: * Available drivers:
* - OpenSSL * - OpenSSL
* - Sodium * - Sodium
*
* @var string
*/ */
public $driver = 'OpenSSL'; public string $driver = 'OpenSSL';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -49,10 +45,8 @@ class Encryption extends BaseConfig
* before it is encrypted. This value should be greater than zero. * before it is encrypted. This value should be greater than zero.
* *
* See the user guide for more information on padding. * See the user guide for more information on padding.
*
* @var int
*/ */
public $blockSize = 16; public int $blockSize = 16;
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -60,8 +54,39 @@ class Encryption extends BaseConfig
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* *
* HMAC digest to use, e.g. 'SHA512' or 'SHA256'. Default value is 'SHA512'. * HMAC digest to use, e.g. 'SHA512' or 'SHA256'. Default value is 'SHA512'.
*
* @var string
*/ */
public $digest = 'SHA512'; public string $digest = 'SHA512';
/**
* Whether the cipher-text should be raw. If set to false, then it will be base64 encoded.
* This setting is only used by OpenSSLHandler.
*
* Set to false for CI3 Encryption compatibility.
*/
public bool $rawData = true;
/**
* Encryption key info.
* This setting is only used by OpenSSLHandler.
*
* Set to 'encryption' for CI3 Encryption compatibility.
*/
public string $encryptKeyInfo = '';
/**
* Authentication key info.
* This setting is only used by OpenSSLHandler.
*
* Set to 'authentication' for CI3 Encryption compatibility.
*/
public string $authKeyInfo = '';
/**
* Cipher to use.
* This setting is only used by OpenSSLHandler.
*
* Set to 'AES-128-CBC' to decrypt encrypted data that encrypted
* by CI3 Encryption default configuration.
*/
public string $cipher = 'AES-256-CTR';
} }

11
app/Config/Events.php
View File

@ -4,6 +4,7 @@ namespace Config;
use CodeIgniter\Events\Events; use CodeIgniter\Events\Events;
use CodeIgniter\Exceptions\FrameworkException; use CodeIgniter\Exceptions\FrameworkException;
use CodeIgniter\HotReloader\HotReloader;
/* /*
* -------------------------------------------------------------------- * --------------------------------------------------------------------
@ -32,9 +33,7 @@ Events::on('pre_system', static function () {
ob_end_flush(); ob_end_flush();
} }
ob_start(static function ($buffer) { ob_start(static fn ($buffer) => $buffer);
return $buffer;
});
} }
/* /*
@ -46,5 +45,11 @@ Events::on('pre_system', static function () {
if (CI_DEBUG && ! is_cli()) { if (CI_DEBUG && ! is_cli()) {
Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect'); Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
Services::toolbar()->respond(); Services::toolbar()->respond();
// Hot Reload route - for framework use on the hot reloader.
if (ENVIRONMENT === 'development') {
Services::routes()->get('__hot-reload', static function () {
(new HotReloader())->run();
});
}
} }
}); });

68
app/Config/Exceptions.php
View File

@ -3,6 +3,10 @@
namespace Config; namespace Config;
use CodeIgniter\Config\BaseConfig; use CodeIgniter\Config\BaseConfig;
use CodeIgniter\Debug\ExceptionHandler;
use CodeIgniter\Debug\ExceptionHandlerInterface;
use Psr\Log\LogLevel;
use Throwable;
/** /**
* Setup how the exception handler works. * Setup how the exception handler works.
@ -17,10 +21,8 @@ class Exceptions extends BaseConfig
* through Services::Log. * through Services::Log.
* *
* Default: true * Default: true
*
* @var bool
*/ */
public $log = true; public bool $log = true;
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -29,9 +31,9 @@ class Exceptions extends BaseConfig
* Any status codes here will NOT be logged if logging is turned on. * Any status codes here will NOT be logged if logging is turned on.
* By default, only 404 (Page Not Found) exceptions are ignored. * By default, only 404 (Page Not Found) exceptions are ignored.
* *
* @var array * @var list<int>
*/ */
public $ignoreCodes = [404]; public array $ignoreCodes = [404];
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -41,10 +43,8 @@ class Exceptions extends BaseConfig
* directories that hold the views used to generate errors. * directories that hold the views used to generate errors.
* *
* Default: APPPATH.'Views/errors' * Default: APPPATH.'Views/errors'
*
* @var string
*/ */
public $errorViewPath = APPPATH . 'Views/errors'; public string $errorViewPath = APPPATH . 'Views/errors';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -54,7 +54,55 @@ class Exceptions extends BaseConfig
* In order to specify 2 levels, use "/" to separate. * In order to specify 2 levels, use "/" to separate.
* ex. ['server', 'setup/password', 'secret_token'] * ex. ['server', 'setup/password', 'secret_token']
* *
* @var array * @var list<string>
*/ */
public $sensitiveDataInTrace = []; public array $sensitiveDataInTrace = [];
/**
* --------------------------------------------------------------------------
* LOG DEPRECATIONS INSTEAD OF THROWING?
* --------------------------------------------------------------------------
* By default, CodeIgniter converts deprecations into exceptions. Also,
* starting in PHP 8.1 will cause a lot of deprecated usage warnings.
* Use this option to temporarily cease the warnings and instead log those.
* This option also works for user deprecations.
*/
public bool $logDeprecations = true;
/**
* --------------------------------------------------------------------------
* LOG LEVEL THRESHOLD FOR DEPRECATIONS
* --------------------------------------------------------------------------
* If `$logDeprecations` is set to `true`, this sets the log level
* to which the deprecation will be logged. This should be one of the log
* levels recognized by PSR-3.
*
* The related `Config\Logger::$threshold` should be adjusted, if needed,
* to capture logging the deprecations.
*/
public string $deprecationLogLevel = LogLevel::WARNING;
/*
* DEFINE THE HANDLERS USED
* --------------------------------------------------------------------------
* Given the HTTP status code, returns exception handler that
* should be used to deal with this error. By default, it will run CodeIgniter's
* default handler and display the error information in the expected format
* for CLI, HTTP, or AJAX requests, as determined by is_cli() and the expected
* response format.
*
* Custom handlers can be returned if you want to handle one or more specific
* error codes yourself like:
*
* if (in_array($statusCode, [400, 404, 500])) {
* return new \App\Libraries\MyExceptionHandler();
* }
* if ($exception instanceOf PageNotFoundException) {
* return new \App\Libraries\MyExceptionHandler();
* }
*/
public function handler(int $statusCode, Throwable $exception): ExceptionHandlerInterface
{
return new ExceptionHandler($this);
}
} }

28
app/Config/Feature.php
View File

@ -10,18 +10,20 @@ use CodeIgniter\Config\BaseConfig;
class Feature extends BaseConfig class Feature extends BaseConfig
{ {
/** /**
* Enable multiple filters for a route or not * Use improved new auto routing instead of the default legacy version.
*
* If you enable this:
* - CodeIgniter\CodeIgniter::handleRequest() uses:
* - CodeIgniter\Filters\Filters::enableFilters(), instead of enableFilter()
* - CodeIgniter\CodeIgniter::tryToRouteIt() uses:
* - CodeIgniter\Router\Router::getFilters(), instead of getFilter()
* - CodeIgniter\Router\Router::handle() uses:
* - property $filtersInfo, instead of $filterInfo
* - CodeIgniter\Router\RouteCollection::getFiltersForRoute(), instead of getFilterForRoute()
*
* @var bool
*/ */
public $multipleFilters = false; public bool $autoRoutesImproved = false;
/**
* Use filter execution order in 4.4 or before.
*/
public bool $oldFilterOrder = false;
/**
* The behavior of `limit(0)` in Query Builder.
*
* If true, `limit(0)` returns all records. (the behavior of 4.4.x or before in version 4.x.)
* If false, `limit(0)` returns no records. (the behavior of 3.1.9 or later in version 3.x.)
*/
public bool $limitZeroAsAll = true;
} }

69
app/Config/Filters.php
View File

@ -2,39 +2,80 @@
namespace Config; namespace Config;
use CodeIgniter\Config\BaseConfig; use CodeIgniter\Config\Filters as BaseFilters;
use CodeIgniter\Filters\Cors;
use CodeIgniter\Filters\CSRF; use CodeIgniter\Filters\CSRF;
use CodeIgniter\Filters\DebugToolbar; use CodeIgniter\Filters\DebugToolbar;
use CodeIgniter\Filters\ForceHTTPS;
use CodeIgniter\Filters\Honeypot; use CodeIgniter\Filters\Honeypot;
use CodeIgniter\Filters\InvalidChars;
use CodeIgniter\Filters\PageCache;
use CodeIgniter\Filters\PerformanceMetrics;
use CodeIgniter\Filters\SecureHeaders;
class Filters extends BaseConfig class Filters extends BaseFilters
{ {
/** /**
* Configures aliases for Filter classes to * Configures aliases for Filter classes to
* make reading things nicer and simpler. * make reading things nicer and simpler.
* *
* @var array * @var array<string, class-string|list<class-string>>
*
* [filter_name => classname]
* or [filter_name => [classname1, classname2, ...]]
*/ */
public $aliases = [ public array $aliases = [
'csrf' => CSRF::class, 'csrf' => CSRF::class,
'toolbar' => DebugToolbar::class, 'toolbar' => DebugToolbar::class,
'honeypot' => Honeypot::class, 'honeypot' => Honeypot::class,
'invalidchars' => InvalidChars::class,
'secureheaders' => SecureHeaders::class,
'cors' => Cors::class,
'forcehttps' => ForceHTTPS::class,
'pagecache' => PageCache::class,
'performance' => PerformanceMetrics::class,
];
/**
* List of special required filters.
*
* The filters listed here are special. They are applied before and after
* other kinds of filters, and always applied even if a route does not exist.
*
* Filters set by default provide framework functionality. If removed,
* those functions will no longer work.
*
* @see https://codeigniter.com/user_guide/incoming/filters.html#provided-filters
*
* @var array{before: list<string>, after: list<string>}
*/
public array $required = [
'before' => [
'forcehttps', // Force Global Secure Requests
'pagecache', // Web Page Caching
],
'after' => [
'pagecache', // Web Page Caching
'performance', // Performance Metrics
'toolbar', // Debug Toolbar
],
]; ];
/** /**
* List of filter aliases that are always * List of filter aliases that are always
* applied before and after every request. * applied before and after every request.
* *
* @var array * @var array<string, array<string, array<string, string>>>|array<string, list<string>>
*/ */
public $globals = [ public array $globals = [
'before' => [ 'before' => [
// 'honeypot', // 'honeypot',
// 'csrf', // 'csrf',
// 'invalidchars',
], ],
'after' => [ 'after' => [
'toolbar',
// 'honeypot', // 'honeypot',
// 'secureheaders',
], ],
]; ];
@ -43,11 +84,15 @@ class Filters extends BaseConfig
* particular HTTP method (GET, POST, etc.). * particular HTTP method (GET, POST, etc.).
* *
* Example: * Example:
* 'post' => ['csrf', 'throttle'] * 'POST' => ['foo', 'bar']
* *
* @var array * If you use this, you should disable auto-routing because auto-routing
* permits any HTTP method to access a controller. Accessing the controller
* with a method you don't expect could bypass the filter.
*
* @var array<string, list<string>>
*/ */
public $methods = []; public array $methods = [];
/** /**
* List of filter aliases that should run on any * List of filter aliases that should run on any
@ -56,7 +101,7 @@ class Filters extends BaseConfig
* Example: * Example:
* 'isLoggedIn' => ['before' => ['account/*', 'profiles/*']] * 'isLoggedIn' => ['before' => ['account/*', 'profiles/*']]
* *
* @var array * @var array<string, array<string, list<string>>>
*/ */
public $filters = []; public array $filters = [];
} }

3
app/Config/ForeignCharacters.php
View File

@ -4,6 +4,9 @@ namespace Config;
use CodeIgniter\Config\ForeignCharacters as BaseForeignCharacters; use CodeIgniter\Config\ForeignCharacters as BaseForeignCharacters;
/**
* @immutable
*/
class ForeignCharacters extends BaseForeignCharacters class ForeignCharacters extends BaseForeignCharacters
{ {
} }

16
app/Config/Format.php
View File

@ -4,6 +4,8 @@ namespace Config;
use CodeIgniter\Config\BaseConfig; use CodeIgniter\Config\BaseConfig;
use CodeIgniter\Format\FormatterInterface; use CodeIgniter\Format\FormatterInterface;
use CodeIgniter\Format\JSONFormatter;
use CodeIgniter\Format\XMLFormatter;
class Format extends BaseConfig class Format extends BaseConfig
{ {
@ -20,9 +22,9 @@ class Format extends BaseConfig
* These formats are only checked when the data passed to the respond() * These formats are only checked when the data passed to the respond()
* method is an array. * method is an array.
* *
* @var string[] * @var list<string>
*/ */
public $supportedResponseFormats = [ public array $supportedResponseFormats = [
'application/json', 'application/json',
'application/xml', // machine-readable XML 'application/xml', // machine-readable XML
'text/xml', // human-readable XML 'text/xml', // human-readable XML
@ -39,10 +41,10 @@ class Format extends BaseConfig
* *
* @var array<string, string> * @var array<string, string>
*/ */
public $formatters = [ public array $formatters = [
'application/json' => 'CodeIgniter\Format\JSONFormatter', 'application/json' => JSONFormatter::class,
'application/xml' => 'CodeIgniter\Format\XMLFormatter', 'application/xml' => XMLFormatter::class,
'text/xml' => 'CodeIgniter\Format\XMLFormatter', 'text/xml' => XMLFormatter::class,
]; ];
/** /**
@ -55,7 +57,7 @@ class Format extends BaseConfig
* *
* @var array<string, int> * @var array<string, int>
*/ */
public $formatterOptions = [ public array $formatterOptions = [
'application/json' => JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES, 'application/json' => JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES,
'application/xml' => 0, 'application/xml' => 0,
'text/xml' => 0, 'text/xml' => 0,

8
app/Config/Generators.php
View File

@ -23,9 +23,13 @@ class Generators extends BaseConfig
* *
* YOU HAVE BEEN WARNED! * YOU HAVE BEEN WARNED!
* *
* @var array<string, string> * @var array<string, array<string, string>|string>
*/ */
public $views = [ public array $views = [
'make:cell' => [
'class' => 'CodeIgniter\Commands\Generators\Views\cell.tpl.php',
'view' => 'CodeIgniter\Commands\Generators\Views\cell_view.tpl.php',
],
'make:command' => 'CodeIgniter\Commands\Generators\Views\command.tpl.php', 'make:command' => 'CodeIgniter\Commands\Generators\Views\command.tpl.php',
'make:config' => 'CodeIgniter\Commands\Generators\Views\config.tpl.php', 'make:config' => 'CodeIgniter\Commands\Generators\Views\config.tpl.php',
'make:controller' => 'CodeIgniter\Commands\Generators\Views\controller.tpl.php', 'make:controller' => 'CodeIgniter\Commands\Generators\Views\controller.tpl.php',

27
app/Config/Honeypot.php
View File

@ -8,36 +8,35 @@ class Honeypot extends BaseConfig
{ {
/** /**
* Makes Honeypot visible or not to human * Makes Honeypot visible or not to human
*
* @var bool
*/ */
public $hidden = true; public bool $hidden = true;
/** /**
* Honeypot Label Content * Honeypot Label Content
*
* @var string
*/ */
public $label = 'Fill This Field'; public string $label = 'Fill This Field';
/** /**
* Honeypot Field Name * Honeypot Field Name
*
* @var string
*/ */
public $name = 'honeypot'; public string $name = 'honeypot';
/** /**
* Honeypot HTML Template * Honeypot HTML Template
*
* @var string
*/ */
public $template = '<label>{label}</label><input type="text" name="{name}" value=""/>'; public string $template = '<label>{label}</label><input type="text" name="{name}" value="">';
/** /**
* Honeypot container * Honeypot container
* *
* @var string * If you enabled CSP, you can remove `style="display:none"`.
*/ */
public $container = '<div style="display:none">{template}</div>'; public string $container = '<div style="display:none">{template}</div>';
/**
* The id attribute for Honeypot container tag
*
* Used when CSP is enabled.
*/
public string $containerId = 'hpc';
} }

10
app/Config/Images.php
View File

@ -10,25 +10,21 @@ class Images extends BaseConfig
{ {
/** /**
* Default handler used if no other handler is specified. * Default handler used if no other handler is specified.
*
* @var string
*/ */
public $defaultHandler = 'gd'; public string $defaultHandler = 'gd';
/** /**
* The path to the image library. * The path to the image library.
* Required for ImageMagick, GraphicsMagick, or NetPBM. * Required for ImageMagick, GraphicsMagick, or NetPBM.
*
* @var string
*/ */
public $libraryPath = '/usr/local/bin/convert'; public string $libraryPath = '/usr/local/bin/convert';
/** /**
* The available handler classes. * The available handler classes.
* *
* @var array<string, string> * @var array<string, string>
*/ */
public $handlers = [ public array $handlers = [
'gd' => GDHandler::class, 'gd' => GDHandler::class,
'imagick' => ImageMagickHandler::class, 'imagick' => ImageMagickHandler::class,
]; ];

40
app/Config/Kint.php
View File

@ -2,8 +2,10 @@
namespace Config; namespace Config;
use CodeIgniter\Config\BaseConfig; use Kint\Parser\ConstructablePluginInterface;
use Kint\Renderer\Renderer; use Kint\Renderer\AbstractRenderer;
use Kint\Renderer\Rich\TabPluginInterface;
use Kint\Renderer\Rich\ValuePluginInterface;
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -15,7 +17,7 @@ use Kint\Renderer\Renderer;
* *
* @see https://kint-php.github.io/kint/ for details on these settings. * @see https://kint-php.github.io/kint/ for details on these settings.
*/ */
class Kint extends BaseConfig class Kint
{ {
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -23,20 +25,32 @@ class Kint extends BaseConfig
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
*/ */
/**
* @var list<class-string<ConstructablePluginInterface>|ConstructablePluginInterface>|null
*/
public $plugins; public $plugins;
public $maxDepth = 6;
public $displayCalledFrom = true; public int $maxDepth = 6;
public $expanded = false; public bool $displayCalledFrom = true;
public bool $expanded = false;
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| RichRenderer Settings | RichRenderer Settings
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
*/ */
public $richTheme = 'aante-light.css'; public string $richTheme = 'aante-light.css';
public $richFolder = false; public bool $richFolder = false;
public $richSort = Renderer::SORT_FULL; public int $richSort = AbstractRenderer::SORT_FULL;
/**
* @var array<string, class-string<ValuePluginInterface>>|null
*/
public $richObjectPlugins; public $richObjectPlugins;
/**
* @var array<string, class-string<TabPluginInterface>>|null
*/
public $richTabPlugins; public $richTabPlugins;
/* /*
@ -44,8 +58,8 @@ class Kint extends BaseConfig
| CLI Settings | CLI Settings
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
*/ */
public $cliColors = true; public bool $cliColors = true;
public $cliForceUTF8 = false; public bool $cliForceUTF8 = false;
public $cliDetectWidth = true; public bool $cliDetectWidth = true;
public $cliMinWidth = 40; public int $cliMinWidth = 40;
} }

19
app/Config/Logger.php
View File

@ -3,6 +3,7 @@
namespace Config; namespace Config;
use CodeIgniter\Config\BaseConfig; use CodeIgniter\Config\BaseConfig;
use CodeIgniter\Log\Handlers\FileHandler;
class Logger extends BaseConfig class Logger extends BaseConfig
{ {
@ -35,9 +36,9 @@ class Logger extends BaseConfig
* For a live site you'll usually enable Critical or higher (3) to be logged otherwise * For a live site you'll usually enable Critical or higher (3) to be logged otherwise
* your log files will fill up very fast. * your log files will fill up very fast.
* *
* @var array|int * @var int|list<int>
*/ */
public $threshold = 9; public $threshold = (ENVIRONMENT === 'production') ? 4 : 9;
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -46,10 +47,8 @@ class Logger extends BaseConfig
* *
* Each item that is logged has an associated date. You can use PHP date * Each item that is logged has an associated date. You can use PHP date
* codes to set your own date formatting * codes to set your own date formatting
*
* @var string
*/ */
public $dateFormat = 'Y-m-d H:i:s'; public string $dateFormat = 'Y-m-d H:i:s';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -74,17 +73,15 @@ class Logger extends BaseConfig
* Handlers are executed in the order defined in this array, starting with * Handlers are executed in the order defined in this array, starting with
* the handler on top and continuing down. * the handler on top and continuing down.
* *
* @var array * @var array<class-string, array<string, int|list<string>|string>>
*/ */
public $handlers = [ public array $handlers = [
/* /*
* -------------------------------------------------------------------- * --------------------------------------------------------------------
* File Handler * File Handler
* -------------------------------------------------------------------- * --------------------------------------------------------------------
*/ */
'CodeIgniter\Log\Handlers\FileHandler' => [ FileHandler::class => [
// The log levels that this handler will handle. // The log levels that this handler will handle.
'handles' => [ 'handles' => [
'critical', 'critical',
@ -102,7 +99,7 @@ class Logger extends BaseConfig
* An extension of 'php' allows for protecting the log files via basic * An extension of 'php' allows for protecting the log files via basic
* scripting, when they are to be stored under a publicly accessible directory. * scripting, when they are to be stored under a publicly accessible directory.
* *
* Note: Leaving it blank will default to 'log'. * NOTE: Leaving it blank will default to 'log'.
*/ */
'fileExtension' => '', 'fileExtension' => '',

23
app/Config/Migrations.php
View File

@ -15,10 +15,8 @@ class Migrations extends BaseConfig
* *
* You should enable migrations whenever you intend to do a schema migration * You should enable migrations whenever you intend to do a schema migration
* and disable it back when you're done. * and disable it back when you're done.
*
* @var bool
*/ */
public $enabled = true; public bool $enabled = true;
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -27,13 +25,9 @@ class Migrations extends BaseConfig
* *
* This is the name of the table that will store the current migrations state. * This is the name of the table that will store the current migrations state.
* When migrations runs it will store in a database table which migration * When migrations runs it will store in a database table which migration
* level the system is at. It then compares the migration level in this * files have already been run.
* table to the $config['migration_version'] if they are not the same it
* will migrate up. This must be set.
*
* @var string
*/ */
public $table = 'migrations'; public string $table = 'migrations';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -42,14 +36,15 @@ class Migrations extends BaseConfig
* *
* This is the format that will be used when creating new migrations * This is the format that will be used when creating new migrations
* using the CLI command: * using the CLI command:
* > php spark migrate:create * > php spark make:migration
* *
* Typical formats: * NOTE: if you set an unsupported format, migration runner will not find
* your migration files.
*
* Supported formats:
* - YmdHis_ * - YmdHis_
* - Y-m-d-His_ * - Y-m-d-His_
* - Y_m_d_His_ * - Y_m_d_His_
*
* @var string
*/ */
public $timestampFormat = 'Y-m-d-His_'; public string $timestampFormat = 'Y-m-d-His_';
} }

26
app/Config/Mimes.php
View File

@ -15,15 +15,17 @@ namespace Config;
* *
* When working with mime types, please make sure you have the ´fileinfo´ * When working with mime types, please make sure you have the ´fileinfo´
* extension enabled to reliably detect the media types. * extension enabled to reliably detect the media types.
*
* @immutable
*/ */
class Mimes class Mimes
{ {
/** /**
* Map of extensions to mime types. * Map of extensions to mime types.
* *
* @var array * @var array<string, list<string>|string>
*/ */
public static $mimes = [ public static array $mimes = [
'hqx' => [ 'hqx' => [
'application/mac-binhex40', 'application/mac-binhex40',
'application/mac-binhex', 'application/mac-binhex',
@ -55,6 +57,8 @@ class Mimes
'lzh' => 'application/octet-stream', 'lzh' => 'application/octet-stream',
'exe' => [ 'exe' => [
'application/octet-stream', 'application/octet-stream',
'application/vnd.microsoft.portable-executable',
'application/x-dosexec',
'application/x-msdownload', 'application/x-msdownload',
], ],
'class' => 'application/octet-stream', 'class' => 'application/octet-stream',
@ -102,8 +106,6 @@ class Mimes
], ],
'pptx' => [ 'pptx' => [
'application/vnd.openxmlformats-officedocument.presentationml.presentation', 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
'application/x-zip',
'application/zip',
], ],
'wbxml' => 'application/wbxml', 'wbxml' => 'application/wbxml',
'wmlc' => 'application/wmlc', 'wmlc' => 'application/wmlc',
@ -260,6 +262,7 @@ class Mimes
'image/png', 'image/png',
'image/x-png', 'image/x-png',
], ],
'webp' => 'image/webp',
'tif' => 'image/tiff', 'tif' => 'image/tiff',
'tiff' => 'image/tiff', 'tiff' => 'image/tiff',
'css' => [ 'css' => [
@ -509,22 +512,21 @@ class Mimes
{ {
$type = trim(strtolower($type), '. '); $type = trim(strtolower($type), '. ');
$proposedExtension = trim(strtolower($proposedExtension)); $proposedExtension = trim(strtolower($proposedExtension ?? ''));
if ($proposedExtension !== '') { if (
if (array_key_exists($proposedExtension, static::$mimes) && in_array($type, is_string(static::$mimes[$proposedExtension]) ? [static::$mimes[$proposedExtension]] : static::$mimes[$proposedExtension], true)) { $proposedExtension !== ''
&& array_key_exists($proposedExtension, static::$mimes)
&& in_array($type, (array) static::$mimes[$proposedExtension], true)
) {
// The detected mime type matches with the proposed extension. // The detected mime type matches with the proposed extension.
return $proposedExtension; 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. // Reverse check the mime type list if no extension was proposed.
// This search is order sensitive! // This search is order sensitive!
foreach (static::$mimes as $ext => $types) { foreach (static::$mimes as $ext => $types) {
if ((is_string($types) && $types === $type) || (is_array($types) && in_array($type, $types, true))) { if (in_array($type, (array) $types, true)) {
return $ext; return $ext;
} }
} }

33
app/Config/Modules.php
View File

@ -4,6 +4,14 @@ namespace Config;
use CodeIgniter\Modules\Modules as BaseModules; use CodeIgniter\Modules\Modules as BaseModules;
/**
* Modules Configuration.
*
* NOTE: This class is required prior to Autoloader instantiation,
* and does not extend BaseConfig.
*
* @immutable
*/
class Modules extends BaseModules class Modules extends BaseModules
{ {
/** /**
@ -31,6 +39,29 @@ class Modules extends BaseModules
*/ */
public $discoverInComposer = true; public $discoverInComposer = true;
/**
* The Composer package list for Auto-Discovery
* This setting is optional.
*
* E.g.:
* [
* 'only' => [
* // List up all packages to auto-discover
* 'codeigniter4/shield',
* ],
* ]
* or
* [
* 'exclude' => [
* // List up packages to exclude.
* 'pestphp/pest',
* ],
* ]
*
* @var array{only?: list<string>, exclude?: list<string>}
*/
public $composerPackages = [];
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* Auto-Discovery Rules * Auto-Discovery Rules
@ -41,7 +72,7 @@ class Modules extends BaseModules
* *
* If it is not listed, only the base application elements will be used. * If it is not listed, only the base application elements will be used.
* *
* @var string[] * @var list<string>
*/ */
public $aliases = [ public $aliases = [
'events', 'events',

32
app/Config/Optimize.php Normal file
View File

@ -0,0 +1,32 @@
<?php
namespace Config;
/**
* Optimization Configuration.
*
* NOTE: This class does not extend BaseConfig for performance reasons.
* So you cannot replace the property values with Environment Variables.
*
* @immutable
*/
class Optimize
{
/**
* --------------------------------------------------------------------------
* Config Caching
* --------------------------------------------------------------------------
*
* @see https://codeigniter.com/user_guide/concepts/factories.html#config-caching
*/
public bool $configCacheEnabled = false;
/**
* --------------------------------------------------------------------------
* Config Caching
* --------------------------------------------------------------------------
*
* @see https://codeigniter.com/user_guide/concepts/autoloader.html#file-locator-caching
*/
public bool $locatorCacheEnabled = false;
}

6
app/Config/Pager.php
View File

@ -20,7 +20,7 @@ class Pager extends BaseConfig
* *
* @var array<string, string> * @var array<string, string>
*/ */
public $templates = [ public array $templates = [
'default_full' => 'CodeIgniter\Pager\Views\default_full', 'default_full' => 'CodeIgniter\Pager\Views\default_full',
'default_simple' => 'CodeIgniter\Pager\Views\default_simple', 'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
'default_head' => 'CodeIgniter\Pager\Views\default_head', 'default_head' => 'CodeIgniter\Pager\Views\default_head',
@ -32,8 +32,6 @@ class Pager extends BaseConfig
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* *
* The default number of results shown in a single page. * The default number of results shown in a single page.
*
* @var int
*/ */
public $perPage = 20; public int $perPage = 20;
} }

29
app/Config/Paths.php
View File

@ -12,6 +12,11 @@ namespace Config;
* share a system folder between multiple applications, and more. * share a system folder between multiple applications, and more.
* *
* All paths are relative to the project's root folder. * All paths are relative to the project's root folder.
*
* NOTE: This class is required prior to Autoloader instantiation,
* and does not extend BaseConfig.
*
* @immutable
*/ */
class Paths class Paths
{ {
@ -22,10 +27,8 @@ class Paths
* *
* This must contain the name of your "system" folder. Include * This must contain the name of your "system" folder. Include
* the path if the folder is not in the same directory as this file. * the path if the folder is not in the same directory as this file.
*
* @var string
*/ */
public $systemDirectory = __DIR__ . '/../../vendor/codeigniter4/framework/system'; public string $systemDirectory = __DIR__ . '/../../vendor/codeigniter4/framework/system';
/** /**
* --------------------------------------------------------------- * ---------------------------------------------------------------
@ -34,14 +37,12 @@ class Paths
* *
* If you want this front controller to use a different "app" * If you want this front controller to use a different "app"
* folder than the default one you can set its name here. The folder * folder than the default one you can set its name here. The folder
* can also be renamed or relocated anywhere on your getServer. If * can also be renamed or relocated anywhere on your server. If
* you do, use a full getServer path. * you do, use a full server path.
* *
* @see http://codeigniter.com/user_guide/general/managing_apps.html * @see http://codeigniter.com/user_guide/general/managing_apps.html
*
* @var string
*/ */
public $appDirectory = __DIR__ . '/..'; public string $appDirectory = __DIR__ . '/..';
/** /**
* --------------------------------------------------------------- * ---------------------------------------------------------------
@ -53,10 +54,8 @@ class Paths
* need write permission to a single place that can be tucked away * need write permission to a single place that can be tucked away
* for maximum security, keeping it out of the app and/or * for maximum security, keeping it out of the app and/or
* system directories. * system directories.
*
* @var string
*/ */
public $writableDirectory = __DIR__ . '/../../writable'; public string $writableDirectory = __DIR__ . '/../../writable';
/** /**
* --------------------------------------------------------------- * ---------------------------------------------------------------
@ -64,10 +63,8 @@ class Paths
* --------------------------------------------------------------- * ---------------------------------------------------------------
* *
* This variable must contain the name of your "tests" directory. * This variable must contain the name of your "tests" directory.
*
* @var string
*/ */
public $testsDirectory = __DIR__ . '/../../tests'; public string $testsDirectory = __DIR__ . '/../../tests';
/** /**
* --------------------------------------------------------------- * ---------------------------------------------------------------
@ -78,8 +75,6 @@ class Paths
* contains the view files used by your application. By * contains the view files used by your application. By
* default this is in `app/Views`. This value * default this is in `app/Views`. This value
* is used when no value is provided to `Services::renderer()`. * is used when no value is provided to `Services::renderer()`.
*
* @var string
*/ */
public $viewDirectory = __DIR__ . '/../Views'; public string $viewDirectory = __DIR__ . '/../Views';
} }

4
app/Config/Publisher.php
View File

@ -19,10 +19,10 @@ class Publisher extends BasePublisher
* result in a PublisherException. Files that do no fit the * result in a PublisherException. Files that do no fit the
* pattern will cause copy/merge to fail. * pattern will cause copy/merge to fail.
* *
* @var array<string,string> * @var array<string, string>
*/ */
public $restrictions = [ public $restrictions = [
ROOTPATH => '*', ROOTPATH => '*',
FCPATH => '#\.(?css|js|map|htm?|xml|json|webmanifest|tff|eot|woff?|gif|jpe?g|tiff?|png|webp|bmp|ico|svg)$#i', FCPATH => '#\.(s?css|js|map|html?|xml|json|webmanifest|ttf|eot|woff2?|gif|jpe?g|tiff?|png|webp|bmp|ico|svg)$#i',
]; ];
} }

59
app/Config/Routes.php
View File

@ -1,56 +1,13 @@
<?php <?php
namespace Config; use CodeIgniter\Router\RouteCollection;
// Create a new instance of our RouteCollection class. /**
$routes = Services::routes(); * @var RouteCollection $routes
// Load the system's routing file first, so that the app and ENVIRONMENT
// can override as needed.
if (file_exists(SYSTEMPATH . 'Config/Routes.php')) {
require SYSTEMPATH . 'Config/Routes.php';
}
/*
* --------------------------------------------------------------------
* Router Setup
* --------------------------------------------------------------------
*/ */
$routes->setDefaultNamespace('App\Controllers');
$routes->setDefaultController('Home');
$routes->setDefaultMethod('index');
$routes->setTranslateURIDashes(false);
$routes->set404Override();
$routes->setAutoRoute(true);
/*
* --------------------------------------------------------------------
* Route Definitions
* --------------------------------------------------------------------
*/
// We get a performance increase by specifying the default
// route since we don't have to scan directories.
$routes->get('/', 'Home::index'); $routes->get('/', 'Home::index');
$routes->get('user/(:any)', 'Users::user/$1');
/* $routes->get('car/(:any)', 'Cars::index/$1');
* -------------------------------------------------------------------- $routes->get('track/(:any)', 'Tracks::index/$1');
* Additional Routing $routes->get('race/(:num)', 'Races::index/$1');
* -------------------------------------------------------------------- $routes->get('users', 'Users::index');
*
* There will often be times that you need additional routing and you
* need it to be able to override any defaults in this file. Environment
* based routes is one such time. require() additional route files here
* to make that happen.
*
* You will have access to the $routes object within that file without
* needing to reload it.
*/
if (file_exists(APPPATH . 'Config/' . ENVIRONMENT . '/Routes.php')) {
require APPPATH . 'Config/' . ENVIRONMENT . '/Routes.php';
}
$routes->add('user/(:any)', 'Users::user/$1');
$routes->add('car/(:any)', 'Cars::index/$1');
$routes->add('track/(:any)', 'Tracks::index/$1');
$routes->add('race/(:num)', 'Races::index/$1');

140
app/Config/Routing.php Normal file
View File

@ -0,0 +1,140 @@
<?php
/**
* This file is part of CodeIgniter 4 framework.
*
* (c) CodeIgniter Foundation <admin@codeigniter.com>
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
namespace Config;
use CodeIgniter\Config\Routing as BaseRouting;
/**
* Routing configuration
*/
class Routing extends BaseRouting
{
/**
* For Defined Routes.
* An array of files that contain route definitions.
* Route files are read in order, with the first match
* found taking precedence.
*
* Default: APPPATH . 'Config/Routes.php'
*
* @var list<string>
*/
public array $routeFiles = [
APPPATH . 'Config/Routes.php',
];
/**
* For Defined Routes and Auto Routing.
* The default namespace to use for Controllers when no other
* namespace has been specified.
*
* Default: 'App\Controllers'
*/
public string $defaultNamespace = 'App\Controllers';
/**
* For Auto Routing.
* The default controller to use when no other controller has been
* specified.
*
* Default: 'Home'
*/
public string $defaultController = 'Home';
/**
* For Defined Routes and Auto Routing.
* The default method to call on the controller when no other
* method has been set in the route.
*
* Default: 'index'
*/
public string $defaultMethod = 'index';
/**
* For Auto Routing.
* Whether to translate dashes in URIs for controller/method to underscores.
* Primarily useful when using the auto-routing.
*
* Default: false
*/
public bool $translateURIDashes = false;
/**
* Sets the class/method that should be called if routing doesn't
* find a match. It can be the controller/method name like: Users::index
*
* This setting is passed to the Router class and handled there.
*
* If you want to use a closure, you will have to set it in the
* routes file by calling:
*
* $routes->set404Override(function() {
* // Do something here
* });
*
* Example:
* public $override404 = 'App\Errors::show404';
*/
public ?string $override404 = null;
/**
* If TRUE, the system will attempt to match the URI against
* Controllers by matching each segment against folders/files
* in APPPATH/Controllers, when a match wasn't found against
* defined routes.
*
* If FALSE, will stop searching and do NO automatic routing.
*/
public bool $autoRoute = false;
/**
* For Defined Routes.
* If TRUE, will enable the use of the 'prioritize' option
* when defining routes.
*
* Default: false
*/
public bool $prioritize = false;
/**
* For Defined Routes.
* If TRUE, matched multiple URI segments will be passed as one parameter.
*
* Default: false
*/
public bool $multipleSegmentsOneParam = false;
/**
* For Auto Routing (Improved).
* Map of URI segments and namespaces.
*
* The key is the first URI segment. The value is the controller namespace.
* E.g.,
* [
* 'blog' => 'Acme\Blog\Controllers',
* ]
*
* @var array<string, string>
*/
public array $moduleRoutes = [];
/**
* For Auto Routing (Improved).
* Whether to translate dashes in URIs for controller/method to CamelCase.
* E.g., blog-controller -> BlogController
*
* If you enable this, $translateURIDashes is ignored.
*
* Default: false
*/
public bool $translateUriToCamelCase = false;
}

41
app/Config/Security.php
View File

@ -15,7 +15,16 @@ class Security extends BaseConfig
* *
* @var string 'cookie' or 'session' * @var string 'cookie' or 'session'
*/ */
public $csrfProtection = 'cookie'; public string $csrfProtection = 'cookie';
/**
* --------------------------------------------------------------------------
* CSRF Token Randomization
* --------------------------------------------------------------------------
*
* Randomize the CSRF Token for added security.
*/
public bool $tokenRandomize = false;
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -23,10 +32,8 @@ class Security extends BaseConfig
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* *
* Token name for Cross Site Request Forgery protection. * Token name for Cross Site Request Forgery protection.
*
* @var string
*/ */
public $tokenName = 'csrf_test_name'; public string $tokenName = 'csrf_test_name';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -34,10 +41,8 @@ class Security extends BaseConfig
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* *
* Header name for Cross Site Request Forgery protection. * Header name for Cross Site Request Forgery protection.
*
* @var string
*/ */
public $headerName = 'X-CSRF-TOKEN'; public string $headerName = 'X-CSRF-TOKEN';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -45,10 +50,8 @@ class Security extends BaseConfig
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* *
* Cookie name for Cross Site Request Forgery protection. * Cookie name for Cross Site Request Forgery protection.
*
* @var string
*/ */
public $cookieName = 'csrf_cookie_name'; public string $cookieName = 'csrf_cookie_name';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -58,10 +61,8 @@ class Security extends BaseConfig
* Expiration time for Cross Site Request Forgery protection cookie. * Expiration time for Cross Site Request Forgery protection cookie.
* *
* Defaults to two hours (in seconds). * Defaults to two hours (in seconds).
*
* @var int
*/ */
public $expires = 7200; public int $expires = 7200;
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -69,10 +70,8 @@ class Security extends BaseConfig
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* *
* Regenerate CSRF Token on every submission. * Regenerate CSRF Token on every submission.
*
* @var bool
*/ */
public $regenerate = true; public bool $regenerate = true;
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -81,9 +80,9 @@ class Security extends BaseConfig
* *
* Redirect to previous page with error on failure. * Redirect to previous page with error on failure.
* *
* @var bool * @see https://codeigniter4.github.io/userguide/libraries/security.html#redirection-on-failure
*/ */
public $redirect = true; public bool $redirect = (ENVIRONMENT === 'production');
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -98,9 +97,7 @@ class Security extends BaseConfig
* *
* @see https://portswigger.net/web-security/csrf/samesite-cookies * @see https://portswigger.net/web-security/csrf/samesite-cookies
* *
* @var string * @deprecated `Config\Cookie` $samesite property is used.
*
* @deprecated
*/ */
public $samesite = 'Lax'; public string $samesite = 'Lax';
} }

127
app/Config/Session.php Normal file
View File

@ -0,0 +1,127 @@
<?php
namespace Config;
use CodeIgniter\Config\BaseConfig;
use CodeIgniter\Session\Handlers\BaseHandler;
use CodeIgniter\Session\Handlers\FileHandler;
class Session extends BaseConfig
{
/**
* --------------------------------------------------------------------------
* 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 class-string<BaseHandler>
*/
public string $driver = FileHandler::class;
/**
* --------------------------------------------------------------------------
* Session Cookie Name
* --------------------------------------------------------------------------
*
* The session cookie name, must contain only [0-9a-z_-] characters
*/
public string $cookieName = '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.
*/
public int $expiration = 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!
*/
public string $savePath = 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.
*/
public bool $matchIP = false;
/**
* --------------------------------------------------------------------------
* Session Time to Update
* --------------------------------------------------------------------------
*
* How many seconds between CI regenerating the session ID.
*/
public int $timeToUpdate = 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.
*/
public bool $regenerateDestroy = false;
/**
* --------------------------------------------------------------------------
* Session Database Group
* --------------------------------------------------------------------------
*
* DB Group for the database session.
*/
public ?string $DBGroup = null;
/**
* --------------------------------------------------------------------------
* Lock Retry Interval (microseconds)
* --------------------------------------------------------------------------
*
* This is used for RedisHandler.
*
* Time (microseconds) to wait if lock cannot be acquired.
* The default is 100,000 microseconds (= 0.1 seconds).
*/
public int $lockRetryInterval = 100_000;
/**
* --------------------------------------------------------------------------
* Lock Max Retries
* --------------------------------------------------------------------------
*
* This is used for RedisHandler.
*
* Maximum number of lock acquisition attempts.
* The default is 300 times. That is lock timeout is about 30 (0.1 * 300)
* seconds.
*/
public int $lockMaxRetries = 300;
}

57
app/Config/Toolbar.php
View File

@ -31,9 +31,9 @@ class Toolbar extends BaseConfig
* List of toolbar collectors that will be called when Debug Toolbar * List of toolbar collectors that will be called when Debug Toolbar
* fires up and collects data from. * fires up and collects data from.
* *
* @var string[] * @var list<class-string>
*/ */
public $collectors = [ public array $collectors = [
Timers::class, Timers::class,
Database::class, Database::class,
Logs::class, Logs::class,
@ -44,6 +44,16 @@ class Toolbar extends BaseConfig
Events::class, Events::class,
]; ];
/**
* --------------------------------------------------------------------------
* Collect Var Data
* --------------------------------------------------------------------------
*
* If set to false var data from the views will not be collected. Useful to
* avoid high memory usage when there are lots of data passed to the view.
*/
public bool $collectVarData = true;
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* Max History * Max History
@ -52,10 +62,8 @@ class Toolbar extends BaseConfig
* `$maxHistory` sets a limit on the number of past requests that are stored, * `$maxHistory` sets a limit on the number of past requests that are stored,
* helping to conserve file space used to store them. You can set it to * helping to conserve file space used to store them. You can set it to
* 0 (zero) to not have any history stored, or -1 for unlimited history. * 0 (zero) to not have any history stored, or -1 for unlimited history.
*
* @var int
*/ */
public $maxHistory = 20; public int $maxHistory = 20;
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -64,10 +72,8 @@ class Toolbar extends BaseConfig
* *
* The full path to the the views that are used by the toolbar. * The full path to the the views that are used by the toolbar.
* This MUST have a trailing slash. * This MUST have a trailing slash.
*
* @var string
*/ */
public $viewsPath = SYSTEMPATH . 'Debug/Toolbar/Views/'; public string $viewsPath = SYSTEMPATH . 'Debug/Toolbar/Views/';
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -80,8 +86,37 @@ class Toolbar extends BaseConfig
* with hundreds of queries. * with hundreds of queries.
* *
* `$maxQueries` defines the maximum amount of queries that will be stored. * `$maxQueries` defines the maximum amount of queries that will be stored.
*
* @var int
*/ */
public $maxQueries = 100; public int $maxQueries = 100;
/**
* --------------------------------------------------------------------------
* Watched Directories
* --------------------------------------------------------------------------
*
* Contains an array of directories that will be watched for changes and
* used to determine if the hot-reload feature should reload the page or not.
* We restrict the values to keep performance as high as possible.
*
* NOTE: The ROOTPATH will be prepended to all values.
*
* @var list<string>
*/
public array $watchedDirectories = [
'app',
];
/**
* --------------------------------------------------------------------------
* Watched File Extensions
* --------------------------------------------------------------------------
*
* Contains an array of file extensions that will be watched for changes and
* used to determine if the hot-reload feature should reload the page or not.
*
* @var list<string>
*/
public array $watchedExtensions = [
'php', 'css', 'js', 'html', 'svg', 'json', 'env',
];
} }

8
app/Config/UserAgents.php
View File

@ -23,7 +23,7 @@ class UserAgents extends BaseConfig
* *
* @var array<string, string> * @var array<string, string>
*/ */
public $platforms = [ public array $platforms = [
'windows nt 10.0' => 'Windows 10', 'windows nt 10.0' => 'Windows 10',
'windows nt 6.3' => 'Windows 8.1', 'windows nt 6.3' => 'Windows 8.1',
'windows nt 6.2' => 'Windows 8', 'windows nt 6.2' => 'Windows 8',
@ -78,7 +78,7 @@ class UserAgents extends BaseConfig
* *
* @var array<string, string> * @var array<string, string>
*/ */
public $browsers = [ public array $browsers = [
'OPR' => 'Opera', 'OPR' => 'Opera',
'Flock' => 'Flock', 'Flock' => 'Flock',
'Edge' => 'Spartan', 'Edge' => 'Spartan',
@ -119,7 +119,7 @@ class UserAgents extends BaseConfig
* *
* @var array<string, string> * @var array<string, string>
*/ */
public $mobiles = [ public array $mobiles = [
// legacy array, old values commented out // legacy array, old values commented out
'mobileexplorer' => 'Mobile Explorer', 'mobileexplorer' => 'Mobile Explorer',
// 'openwave' => 'Open Wave', // 'openwave' => 'Open Wave',
@ -228,7 +228,7 @@ class UserAgents extends BaseConfig
* *
* @var array<string, string> * @var array<string, string>
*/ */
public $robots = [ public array $robots = [
'googlebot' => 'Googlebot', 'googlebot' => 'Googlebot',
'msnbot' => 'MSNBot', 'msnbot' => 'MSNBot',
'baiduspider' => 'Baiduspider', 'baiduspider' => 'Baiduspider',

25
app/Config/Validation.php
View File

@ -2,24 +2,25 @@
namespace Config; namespace Config;
use CodeIgniter\Validation\CreditCardRules; use CodeIgniter\Config\BaseConfig;
use CodeIgniter\Validation\FileRules; use CodeIgniter\Validation\StrictRules\CreditCardRules;
use CodeIgniter\Validation\FormatRules; use CodeIgniter\Validation\StrictRules\FileRules;
use CodeIgniter\Validation\Rules; use CodeIgniter\Validation\StrictRules\FormatRules;
use CodeIgniter\Validation\StrictRules\Rules;
class Validation class Validation extends BaseConfig
{ {
//-------------------------------------------------------------------- // --------------------------------------------------------------------
// Setup // Setup
//-------------------------------------------------------------------- // --------------------------------------------------------------------
/** /**
* Stores the classes that contain the * Stores the classes that contain the
* rules that are available. * rules that are available.
* *
* @var string[] * @var list<string>
*/ */
public $ruleSets = [ public array $ruleSets = [
Rules::class, Rules::class,
FormatRules::class, FormatRules::class,
FileRules::class, FileRules::class,
@ -32,12 +33,12 @@ class Validation
* *
* @var array<string, string> * @var array<string, string>
*/ */
public $templates = [ public array $templates = [
'list' => 'CodeIgniter\Validation\Views\list', 'list' => 'CodeIgniter\Validation\Views\list',
'single' => 'CodeIgniter\Validation\Views\single', 'single' => 'CodeIgniter\Validation\Views\single',
]; ];
//-------------------------------------------------------------------- // --------------------------------------------------------------------
// Rules // Rules
//-------------------------------------------------------------------- // --------------------------------------------------------------------
} }

22
app/Config/View.php
View File

@ -3,7 +3,12 @@
namespace Config; namespace Config;
use CodeIgniter\Config\View as BaseView; use CodeIgniter\Config\View as BaseView;
use CodeIgniter\View\ViewDecoratorInterface;
/**
* @phpstan-type parser_callable (callable(mixed): mixed)
* @phpstan-type parser_callable_string (callable(mixed): mixed)&string
*/
class View extends BaseView class View extends BaseView
{ {
/** /**
@ -29,7 +34,8 @@ class View extends BaseView
* { title|esc(js) } * { title|esc(js) }
* { created_on|date(Y-m-d)|esc(attr) } * { created_on|date(Y-m-d)|esc(attr) }
* *
* @var array * @var array<string, string>
* @phpstan-var array<string, parser_callable_string>
*/ */
public $filters = []; public $filters = [];
@ -38,7 +44,19 @@ class View extends BaseView
* by the core Parser by creating aliases that will be replaced with * by the core Parser by creating aliases that will be replaced with
* any callable. Can be single or tag pair. * any callable. Can be single or tag pair.
* *
* @var array * @var array<string, callable|list<string>|string>
* @phpstan-var array<string, list<parser_callable_string>|parser_callable_string|parser_callable>
*/ */
public $plugins = []; public $plugins = [];
/**
* View Decorators are class methods that will be run in sequence to
* have a chance to alter the generated output just prior to caching
* the results.
*
* All classes must implement CodeIgniter\View\ViewDecoratorInterface
*
* @var list<class-string<ViewDecoratorInterface>>
*/
public array $decorators = [];
} }

2
composer.json
View File

@ -19,8 +19,6 @@
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"App\\": "app",
"Config\\": "app/Config"
}, },
"exclude-from-classmap": [ "exclude-from-classmap": [
"**/Database/Migrations/**" "**/Database/Migrations/**"

1011
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
public/.htaccess
View File

@ -1,5 +1,5 @@
# Disable directory browsing # Disable directory browsing
Options All -Indexes Options -Indexes
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Rewrite engine # Rewrite engine

55
public/index.php
View File

@ -1,8 +1,39 @@
<?php <?php
/*
*---------------------------------------------------------------
* CHECK PHP VERSION
*---------------------------------------------------------------
*/
$minPhpVersion = '8.1'; // If you update this, don't forget to update `spark`.
if (version_compare(PHP_VERSION, $minPhpVersion, '<')) {
$message = sprintf(
'Your PHP version must be %s or higher to run CodeIgniter. Current version: %s',
$minPhpVersion,
PHP_VERSION
);
header('HTTP/1.1 503 Service Unavailable.', true, 503);
echo $message;
exit(1);
}
/*
*---------------------------------------------------------------
* SET THE CURRENT DIRECTORY
*---------------------------------------------------------------
*/
// Path to the front controller (this file) // Path to the front controller (this file)
define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR); define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR);
// Ensure the current directory is pointing to the front controller's directory
if (getcwd() . DIRECTORY_SEPARATOR !== FCPATH) {
chdir(FCPATH);
}
/* /*
*--------------------------------------------------------------- *---------------------------------------------------------------
* BOOTSTRAP THE APPLICATION * BOOTSTRAP THE APPLICATION
@ -12,26 +43,14 @@ define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR);
* and fires up an environment-specific bootstrapping. * and fires up an environment-specific bootstrapping.
*/ */
// Ensure the current directory is pointing to the front controller's directory // LOAD OUR PATHS CONFIG FILE
chdir(__DIR__);
// Load our paths config file
// This is the line that might need to be changed, depending on your folder structure. // This is the line that might need to be changed, depending on your folder structure.
$pathsConfig = FCPATH . '../app/Config/Paths.php'; require FCPATH . '../app/Config/Paths.php';
// ^^^ Change this if you move your application folder // ^^^ Change this line if you move your application folder
require realpath($pathsConfig) ?: $pathsConfig;
$paths = new Config\Paths(); $paths = new Config\Paths();
// Location of the framework bootstrap file. // LOAD THE FRAMEWORK BOOTSTRAP FILE
$bootstrap = rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php'; require $paths->systemDirectory . '/Boot.php';
$app = require realpath($bootstrap) ?: $bootstrap;
/* exit(CodeIgniter\Boot::bootWeb($paths));
*---------------------------------------------------------------
* LAUNCH THE APPLICATION
*---------------------------------------------------------------
* Now that everything is setup, it's time to actually fire
* up the engines and make this app do its thang.
*/
$app->run();

101
spark
View File

@ -1,18 +1,66 @@
#!/usr/bin/env php #!/usr/bin/env php
<?php <?php
/**
* This file is part of CodeIgniter 4 framework.
*
* (c) CodeIgniter Foundation <admin@codeigniter.com>
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
/* /*
* -------------------------------------------------------------------- * --------------------------------------------------------------------
* CodeIgniter command-line tools * CODEIGNITER COMMAND-LINE TOOLS
* -------------------------------------------------------------------- * --------------------------------------------------------------------
* The main entry point into the CLI system and allows you to run * The main entry point into the CLI system and allows you to run
* commands and perform maintenance on your application. * commands and perform maintenance on your application.
*
* Because CodeIgniter can handle CLI requests as just another web request
* this class mainly acts as a passthru to the framework itself.
*/ */
define('SPARKED', true); /*
*---------------------------------------------------------------
* CHECK SERVER API
*---------------------------------------------------------------
*/
// Refuse to run when called from php-cgi
if (strpos(PHP_SAPI, 'cgi') === 0) {
exit("The cli tool is not supported when running php-cgi. It needs php-cli to function!\n\n");
}
/*
*---------------------------------------------------------------
* CHECK PHP VERSION
*---------------------------------------------------------------
*/
$minPhpVersion = '8.1'; // If you update this, don't forget to update `public/index.php`.
if (version_compare(PHP_VERSION, $minPhpVersion, '<')) {
$message = sprintf(
'Your PHP version must be %s or higher to run CodeIgniter. Current version: %s',
$minPhpVersion,
PHP_VERSION
);
exit($message);
}
// We want errors to be shown when using it from the CLI.
error_reporting(E_ALL);
ini_set('display_errors', '1');
/*
*---------------------------------------------------------------
* SET THE CURRENT DIRECTORY
*---------------------------------------------------------------
*/
// Path to the front controller
define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR);
// Ensure the current directory is pointing to the front controller's directory
chdir(FCPATH);
/* /*
*--------------------------------------------------------------- *---------------------------------------------------------------
@ -23,45 +71,14 @@ define('SPARKED', true);
* and fires up an environment-specific bootstrapping. * and fires up an environment-specific bootstrapping.
*/ */
// Refuse to run when called from php-cgi // LOAD OUR PATHS CONFIG FILE
if (strpos(PHP_SAPI, 'cgi') === 0) { // This is the line that might need to be changed, depending on your folder structure.
exit("The cli tool is not supported when running php-cgi. It needs php-cli to function!\n\n"); require FCPATH . '../app/Config/Paths.php';
}
// Path to the front controller
define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR);
// Load our paths config file
$pathsConfig = 'app/Config/Paths.php';
// ^^^ Change this line if you move your application folder // ^^^ Change this line if you move your application folder
require realpath($pathsConfig) ?: $pathsConfig;
$paths = new Config\Paths(); $paths = new Config\Paths();
// Ensure the current directory is pointing to the front controller's directory // LOAD THE FRAMEWORK BOOTSTRAP FILE
chdir(FCPATH); require $paths->systemDirectory . '/Boot.php';
$bootstrap = rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php'; exit(CodeIgniter\Boot::bootSpark($paths));
$app = require realpath($bootstrap) ?: $bootstrap;
// Grab our Console
$console = new CodeIgniter\CLI\Console($app);
// We want errors to be shown when using it from the CLI.
error_reporting(-1);
ini_set('display_errors', '1');
// Show basic information before we do anything else.
if (is_int($suppress = array_search('--no-header', $_SERVER['argv'], true))) {
unset($_SERVER['argv'][$suppress]); // @codeCoverageIgnore
$suppress = true;
}
$console->showHeader($suppress);
// fire off the command in the main framework.
$response = $console->run();
if ($response->getStatusCode() >= 300) {
exit($response->getStatusCode());
}