From 7bb9d00631feda31035b4a421fc9150842adbfa5 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Sun, 30 Aug 2026 19:09:04 +0800 Subject: [PATCH] refactor: bound phpstan's analysed PHP versions --- phpstan.dist.neon | 4 +++- system/Session/Handlers/FileHandler.php | 19 ++++++------------- system/Session/Session.php | 20 +++++++------------- 3 files changed, 16 insertions(+), 27 deletions(-) diff --git a/phpstan.dist.neon b/phpstan.dist.neon index 71e4151f6f3d..7d6f2d81a709 100644 --- a/phpstan.dist.neon +++ b/phpstan.dist.neon @@ -2,7 +2,9 @@ includes: - utils/phpstan-baseline/loader.neon parameters: - phpVersion: 80200 + phpVersion: + min: 80200 + max: 80599 tmpDir: build/phpstan level: 6 bootstrapFiles: diff --git a/system/Session/Handlers/FileHandler.php b/system/Session/Handlers/FileHandler.php index a985b5f89793..389e1ef50694 100644 --- a/system/Session/Handlers/FileHandler.php +++ b/system/Session/Handlers/FileHandler.php @@ -300,9 +300,7 @@ public function gc($max_lifetime): false|int } /** - * Configure Session ID regular expression. - * - * To make life easier, we force the PHP defaults. Because PHP9 forces them. + * Configure Session ID regular expression. To make life easier, we force the PHP defaults because PHP 9 forces them. * * @see https://wiki.php.net/rfc/deprecations_php_8_4#sessionsid_length_and_sessionsid_bits_per_character * @@ -310,17 +308,12 @@ public function gc($max_lifetime): false|int */ protected function configureSessionIDRegex() { - $bitsPerCharacter = (int) ini_get('session.sid_bits_per_character'); - $sidLength = (int) ini_get('session.sid_length'); + if ((int) ini_get('session.sid_bits_per_character') !== 4) { + ini_set('session.sid_bits_per_character', '4'); + } - // We force the PHP defaults. - if (PHP_VERSION_ID < 90000) { - if ($bitsPerCharacter !== 4) { - ini_set('session.sid_bits_per_character', '4'); - } - if ($sidLength !== 32) { - ini_set('session.sid_length', '32'); - } + if ((int) ini_get('session.sid_length') !== 32) { + ini_set('session.sid_length', '32'); } $this->sessionIDRegex = '[0-9a-f]{32}'; diff --git a/system/Session/Session.php b/system/Session/Session.php index 1998a0ea8596..65b1e87558d8 100644 --- a/system/Session/Session.php +++ b/system/Session/Session.php @@ -186,26 +186,20 @@ protected function configure() } /** - * Configure session ID length. + * Configure session ID length. To make life easier, we force the PHP defaults because PHP 9 forces them. * - * To make life easier, we force the PHP defaults. Because PHP9 forces them. - * See https://wiki.php.net/rfc/deprecations_php_8_4#sessionsid_length_and_sessionsid_bits_per_character + * @see https://wiki.php.net/rfc/deprecations_php_8_4#sessionsid_length_and_sessionsid_bits_per_character * * @return void */ protected function configureSidLength() { - $bitsPerCharacter = (int) ini_get('session.sid_bits_per_character'); - $sidLength = (int) ini_get('session.sid_length'); + if ((int) ini_get('session.sid_bits_per_character') !== 4) { + ini_set('session.sid_bits_per_character', '4'); + } - // We force the PHP defaults. - if (PHP_VERSION_ID < 90000) { - if ($bitsPerCharacter !== 4) { - ini_set('session.sid_bits_per_character', '4'); - } - if ($sidLength !== 32) { - ini_set('session.sid_length', '32'); - } + if ((int) ini_get('session.sid_length') !== 32) { + ini_set('session.sid_length', '32'); } $this->sidRegexp = '[0-9a-f]{32}';