Loading app/Config/App.php +0 −271 Original line number Diff line number Diff line Loading @@ -5,7 +5,6 @@ declare(strict_types=1); namespace Config; use CodeIgniter\Config\BaseConfig; use CodeIgniter\Session\Handlers\FileHandler; class App extends BaseConfig { Loading Loading @@ -138,191 +137,6 @@ class App extends BaseConfig */ public bool $forceGlobalSecureRequests = true; /** * -------------------------------------------------------------------------- * Session Driver * -------------------------------------------------------------------------- * * The session storage driver to use: * - `CodeIgniter\Session\Handlers\FileHandler` * - `CodeIgniter\Session\Handlers\DatabaseHandler` * - `CodeIgniter\Session\Handlers\MemcachedHandler` * - `CodeIgniter\Session\Handlers\RedisHandler` * * @deprecated use Config\Session::$driver instead. */ public string $sessionDriver = FileHandler::class; /** * -------------------------------------------------------------------------- * Session Cookie Name * -------------------------------------------------------------------------- * * The session cookie name, must contain only [0-9a-z_-] characters * * @deprecated use Config\Session::$cookieName instead. */ public string $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. * * @deprecated use Config\Session::$expiration instead. */ public int $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! * * @deprecated use Config\Session::$savePath instead. */ public string $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. * * @deprecated use Config\Session::$matchIP instead. */ public bool $sessionMatchIP = false; /** * -------------------------------------------------------------------------- * Session Time to Update * -------------------------------------------------------------------------- * * How many seconds between CI regenerating the session ID. * * @deprecated use Config\Session::$timeToUpdate instead. */ public int $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. * * @deprecated use Config\Session::$regenerateDestroy instead. */ public bool $sessionRegenerateDestroy = false; /** * -------------------------------------------------------------------------- * Session Database Group * -------------------------------------------------------------------------- * * DB Group for the database session. * * @deprecated use Config\Session::$DBGroup instead. */ public ?string $sessionDBGroup = null; /** * -------------------------------------------------------------------------- * Cookie Prefix * -------------------------------------------------------------------------- * * Set a cookie name prefix if you need to avoid collisions. * * @deprecated use Config\Cookie::$prefix property instead. */ public string $cookiePrefix = ''; /** * -------------------------------------------------------------------------- * Cookie Domain * -------------------------------------------------------------------------- * * Set to `.your-domain.com` for site-wide cookies. * * @deprecated use Config\Cookie::$domain property instead. */ public string $cookieDomain = ''; /** * -------------------------------------------------------------------------- * Cookie Path * -------------------------------------------------------------------------- * * Typically will be a forward slash. * * @deprecated use Config\Cookie::$path property instead. */ public string $cookiePath = '/'; /** * -------------------------------------------------------------------------- * Cookie Secure * -------------------------------------------------------------------------- * * Cookie will only be set if a secure HTTPS connection exists. * * @deprecated use Config\Cookie::$secure property instead. */ public bool $cookieSecure = false; /** * -------------------------------------------------------------------------- * Cookie HttpOnly * -------------------------------------------------------------------------- * * Cookie will only be accessible via HTTP(S) (no JavaScript). * * @deprecated use Config\Cookie::$httponly property instead. */ public bool $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. * * @deprecated `Config\Cookie` $samesite property is used. */ public ?string $cookieSameSite = 'Lax'; /** * -------------------------------------------------------------------------- * Reverse Proxy IPs Loading @@ -346,91 +160,6 @@ class App extends BaseConfig */ public array $proxyIPs = []; /** * -------------------------------------------------------------------------- * CSRF Token Name * -------------------------------------------------------------------------- * * The token name. * * @deprecated Use `Config\Security` $tokenName property instead of using this property. */ public string $CSRFTokenName = 'csrf_test_name'; /** * -------------------------------------------------------------------------- * CSRF Header Name * -------------------------------------------------------------------------- * * The header name. * * @deprecated Use `Config\Security` $headerName property instead of using this property. */ public string $CSRFHeaderName = 'X-CSRF-TOKEN'; /** * -------------------------------------------------------------------------- * CSRF Cookie Name * -------------------------------------------------------------------------- * * The cookie name. * * @deprecated Use `Config\Security` $cookieName property instead of using this property. */ public string $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. */ public int $CSRFExpire = 7200; /** * -------------------------------------------------------------------------- * CSRF Regenerate * -------------------------------------------------------------------------- * * Regenerate token on every submission? * * @deprecated Use `Config\Security` $regenerate property instead of using this property. */ public bool $CSRFRegenerate = true; /** * -------------------------------------------------------------------------- * CSRF Redirect * -------------------------------------------------------------------------- * * Redirect to previous page with error on failure? * * @deprecated Use `Config\Security` $redirect property instead of using this property. */ public bool $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. */ public string $CSRFSameSite = 'Lax'; /** * -------------------------------------------------------------------------- * Content Security Policy Loading app/Config/CURLRequest.php +1 −1 Original line number Diff line number Diff line Loading @@ -18,5 +18,5 @@ class CURLRequest extends BaseConfig * If true, all the options won't be reset between requests. * It may cause an error request with unnecessary headers. */ public bool $shareOptions = true; public bool $shareOptions = false; } app/Config/Cookie.php +2 −0 Original line number Diff line number Diff line Loading @@ -84,6 +84,8 @@ class Cookie extends BaseConfig * Defaults to `Lax` for compatibility with modern browsers. Setting `''` * (empty string) means default SameSite attribute set by browsers (`Lax`) * will be set on cookies. If set to `None`, `$secure` must also be set. * * @phpstan-var 'None'|'Lax'|'Strict'|'' */ public string $samesite = 'Lax'; Loading app/Config/Database.php +18 −17 Original line number Diff line number Diff line Loading @@ -44,6 +44,7 @@ class Database extends Config 'strictOn' => false, 'failover' => [], 'port' => 3306, 'numberNative' => false, ]; /** Loading app/Config/Events.php +8 −0 Original line number Diff line number Diff line Loading @@ -10,6 +10,7 @@ use App\Models\EpisodeModel; use CodeIgniter\Debug\Toolbar\Collectors\Database; use CodeIgniter\Events\Events; use CodeIgniter\Exceptions\FrameworkException; use CodeIgniter\HotReloader\HotReloader; /* * -------------------------------------------------------------------- Loading Loading @@ -50,6 +51,13 @@ Events::on('pre_system', static function () { if (CI_DEBUG && ! is_cli()) { Events::on('DBQuery', Database::class . '::collect'); Services::toolbar()->respond(); // Hot Reload route - for framework use on the hot reloader. if (ENVIRONMENT === 'development') { Services::routes()->get('__hot-reload', static function (): void { (new HotReloader())->run(); }); } } }); Loading Loading
app/Config/App.php +0 −271 Original line number Diff line number Diff line Loading @@ -5,7 +5,6 @@ declare(strict_types=1); namespace Config; use CodeIgniter\Config\BaseConfig; use CodeIgniter\Session\Handlers\FileHandler; class App extends BaseConfig { Loading Loading @@ -138,191 +137,6 @@ class App extends BaseConfig */ public bool $forceGlobalSecureRequests = true; /** * -------------------------------------------------------------------------- * Session Driver * -------------------------------------------------------------------------- * * The session storage driver to use: * - `CodeIgniter\Session\Handlers\FileHandler` * - `CodeIgniter\Session\Handlers\DatabaseHandler` * - `CodeIgniter\Session\Handlers\MemcachedHandler` * - `CodeIgniter\Session\Handlers\RedisHandler` * * @deprecated use Config\Session::$driver instead. */ public string $sessionDriver = FileHandler::class; /** * -------------------------------------------------------------------------- * Session Cookie Name * -------------------------------------------------------------------------- * * The session cookie name, must contain only [0-9a-z_-] characters * * @deprecated use Config\Session::$cookieName instead. */ public string $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. * * @deprecated use Config\Session::$expiration instead. */ public int $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! * * @deprecated use Config\Session::$savePath instead. */ public string $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. * * @deprecated use Config\Session::$matchIP instead. */ public bool $sessionMatchIP = false; /** * -------------------------------------------------------------------------- * Session Time to Update * -------------------------------------------------------------------------- * * How many seconds between CI regenerating the session ID. * * @deprecated use Config\Session::$timeToUpdate instead. */ public int $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. * * @deprecated use Config\Session::$regenerateDestroy instead. */ public bool $sessionRegenerateDestroy = false; /** * -------------------------------------------------------------------------- * Session Database Group * -------------------------------------------------------------------------- * * DB Group for the database session. * * @deprecated use Config\Session::$DBGroup instead. */ public ?string $sessionDBGroup = null; /** * -------------------------------------------------------------------------- * Cookie Prefix * -------------------------------------------------------------------------- * * Set a cookie name prefix if you need to avoid collisions. * * @deprecated use Config\Cookie::$prefix property instead. */ public string $cookiePrefix = ''; /** * -------------------------------------------------------------------------- * Cookie Domain * -------------------------------------------------------------------------- * * Set to `.your-domain.com` for site-wide cookies. * * @deprecated use Config\Cookie::$domain property instead. */ public string $cookieDomain = ''; /** * -------------------------------------------------------------------------- * Cookie Path * -------------------------------------------------------------------------- * * Typically will be a forward slash. * * @deprecated use Config\Cookie::$path property instead. */ public string $cookiePath = '/'; /** * -------------------------------------------------------------------------- * Cookie Secure * -------------------------------------------------------------------------- * * Cookie will only be set if a secure HTTPS connection exists. * * @deprecated use Config\Cookie::$secure property instead. */ public bool $cookieSecure = false; /** * -------------------------------------------------------------------------- * Cookie HttpOnly * -------------------------------------------------------------------------- * * Cookie will only be accessible via HTTP(S) (no JavaScript). * * @deprecated use Config\Cookie::$httponly property instead. */ public bool $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. * * @deprecated `Config\Cookie` $samesite property is used. */ public ?string $cookieSameSite = 'Lax'; /** * -------------------------------------------------------------------------- * Reverse Proxy IPs Loading @@ -346,91 +160,6 @@ class App extends BaseConfig */ public array $proxyIPs = []; /** * -------------------------------------------------------------------------- * CSRF Token Name * -------------------------------------------------------------------------- * * The token name. * * @deprecated Use `Config\Security` $tokenName property instead of using this property. */ public string $CSRFTokenName = 'csrf_test_name'; /** * -------------------------------------------------------------------------- * CSRF Header Name * -------------------------------------------------------------------------- * * The header name. * * @deprecated Use `Config\Security` $headerName property instead of using this property. */ public string $CSRFHeaderName = 'X-CSRF-TOKEN'; /** * -------------------------------------------------------------------------- * CSRF Cookie Name * -------------------------------------------------------------------------- * * The cookie name. * * @deprecated Use `Config\Security` $cookieName property instead of using this property. */ public string $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. */ public int $CSRFExpire = 7200; /** * -------------------------------------------------------------------------- * CSRF Regenerate * -------------------------------------------------------------------------- * * Regenerate token on every submission? * * @deprecated Use `Config\Security` $regenerate property instead of using this property. */ public bool $CSRFRegenerate = true; /** * -------------------------------------------------------------------------- * CSRF Redirect * -------------------------------------------------------------------------- * * Redirect to previous page with error on failure? * * @deprecated Use `Config\Security` $redirect property instead of using this property. */ public bool $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. */ public string $CSRFSameSite = 'Lax'; /** * -------------------------------------------------------------------------- * Content Security Policy Loading
app/Config/CURLRequest.php +1 −1 Original line number Diff line number Diff line Loading @@ -18,5 +18,5 @@ class CURLRequest extends BaseConfig * If true, all the options won't be reset between requests. * It may cause an error request with unnecessary headers. */ public bool $shareOptions = true; public bool $shareOptions = false; }
app/Config/Cookie.php +2 −0 Original line number Diff line number Diff line Loading @@ -84,6 +84,8 @@ class Cookie extends BaseConfig * Defaults to `Lax` for compatibility with modern browsers. Setting `''` * (empty string) means default SameSite attribute set by browsers (`Lax`) * will be set on cookies. If set to `None`, `$secure` must also be set. * * @phpstan-var 'None'|'Lax'|'Strict'|'' */ public string $samesite = 'Lax'; Loading
app/Config/Database.php +18 −17 Original line number Diff line number Diff line Loading @@ -44,6 +44,7 @@ class Database extends Config 'strictOn' => false, 'failover' => [], 'port' => 3306, 'numberNative' => false, ]; /** Loading
app/Config/Events.php +8 −0 Original line number Diff line number Diff line Loading @@ -10,6 +10,7 @@ use App\Models\EpisodeModel; use CodeIgniter\Debug\Toolbar\Collectors\Database; use CodeIgniter\Events\Events; use CodeIgniter\Exceptions\FrameworkException; use CodeIgniter\HotReloader\HotReloader; /* * -------------------------------------------------------------------- Loading Loading @@ -50,6 +51,13 @@ Events::on('pre_system', static function () { if (CI_DEBUG && ! is_cli()) { Events::on('DBQuery', Database::class . '::collect'); Services::toolbar()->respond(); // Hot Reload route - for framework use on the hot reloader. if (ENVIRONMENT === 'development') { Services::routes()->get('__hot-reload', static function (): void { (new HotReloader())->run(); }); } } }); Loading
