From d0813465288ef6cd3e990fcdf47dca8d85770db2 Mon Sep 17 00:00:00 2001 From: objecttothis <17935339+objecttothis@users.noreply.github.com> Date: Fri, 21 Aug 2026 11:28:19 +0400 Subject: [PATCH] Codeigniter changes between 4.7.2 and 4.7.4 (#4650) Signed-off-by: objecttothis <17935339+objecttothis@users.noreply.github.com> --- app/Config/Events.php | 3 ++- app/Config/Routes.php | 4 +--- app/Config/Session.php | 1 + app/Config/View.php | 10 ++-------- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app/Config/Events.php b/app/Config/Events.php index b69e04947..c46a6f5c6 100644 --- a/app/Config/Events.php +++ b/app/Config/Events.php @@ -37,7 +37,8 @@ Events::on('pre_system', static function (): void { throw new ConfigException('Encryption key could not be provisioned. Check that .env is writable.'); } - if (ini_get('zlib.output_compression')) { + $value = ini_get('zlib.output_compression'); + if (filter_var($value, FILTER_VALIDATE_BOOLEAN) || (int) $value > 0) { throw FrameworkException::forEnabledZlibOutputCompression(); } diff --git a/app/Config/Routes.php b/app/Config/Routes.php index b1cc0a484..a082e6233 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -2,9 +2,7 @@ use CodeIgniter\Router\RouteCollection; -/** - * @var RouteCollection $routes - */ +/** @var RouteCollection $routes */ $routes->setDefaultController('Login'); $routes->get('/', 'Login::index'); diff --git a/app/Config/Session.php b/app/Config/Session.php index 3d78928f4..700fe255f 100644 --- a/app/Config/Session.php +++ b/app/Config/Session.php @@ -15,6 +15,7 @@ class Session extends BaseConfig * -------------------------------------------------------------------------- * * The session storage driver to use: + * - `CodeIgniter\Session\Handlers\ArrayHandler` (for testing) * - `CodeIgniter\Session\Handlers\FileHandler` * - `CodeIgniter\Session\Handlers\DatabaseHandler` * - `CodeIgniter\Session\Handlers\MemcachedHandler` diff --git a/app/Config/View.php b/app/Config/View.php index 582ef7327..b52d980dc 100644 --- a/app/Config/View.php +++ b/app/Config/View.php @@ -5,10 +5,6 @@ namespace Config; 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 { /** @@ -34,8 +30,7 @@ class View extends BaseView * { title|esc(js) } * { created_on|date(Y-m-d)|esc(attr) } * - * @var array - * @phpstan-var array + * @var array */ public $filters = []; @@ -44,8 +39,7 @@ class View extends BaseView * by the core Parser by creating aliases that will be replaced with * any callable. Can be single or tag pair. * - * @var array|string> - * @phpstan-var array|parser_callable_string|parser_callable> + * @var array> */ public $plugins = [];