Skip to content

Commit f6533e9

Browse files
authored
refactor: bound phpstan's analysed PHP versions (#10505)
1 parent 70c99eb commit f6533e9

3 files changed

Lines changed: 16 additions & 27 deletions

File tree

phpstan.dist.neon

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ includes:
22
- utils/phpstan-baseline/loader.neon
33

44
parameters:
5-
phpVersion: 80200
5+
phpVersion:
6+
min: 80200
7+
max: 80599
68
tmpDir: build/phpstan
79
level: 6
810
bootstrapFiles:

system/Session/Handlers/FileHandler.php

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -298,27 +298,20 @@ public function gc($max_lifetime): false|int
298298
}
299299

300300
/**
301-
* Configure Session ID regular expression.
302-
*
303-
* To make life easier, we force the PHP defaults. Because PHP9 forces them.
301+
* Configure Session ID regular expression. To make life easier, we force the PHP defaults because PHP 9 forces them.
304302
*
305303
* @see https://wiki.php.net/rfc/deprecations_php_8_4#sessionsid_length_and_sessionsid_bits_per_character
306304
*
307305
* @return void
308306
*/
309307
protected function configureSessionIDRegex()
310308
{
311-
$bitsPerCharacter = (int) ini_get('session.sid_bits_per_character');
312-
$sidLength = (int) ini_get('session.sid_length');
309+
if ((int) ini_get('session.sid_bits_per_character') !== 4) {
310+
ini_set('session.sid_bits_per_character', '4');
311+
}
313312

314-
// We force the PHP defaults.
315-
if (PHP_VERSION_ID < 90000) {
316-
if ($bitsPerCharacter !== 4) {
317-
ini_set('session.sid_bits_per_character', '4');
318-
}
319-
if ($sidLength !== 32) {
320-
ini_set('session.sid_length', '32');
321-
}
313+
if ((int) ini_get('session.sid_length') !== 32) {
314+
ini_set('session.sid_length', '32');
322315
}
323316

324317
$this->sessionIDRegex = '[0-9a-f]{32}';

system/Session/Session.php

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -186,26 +186,20 @@ protected function configure()
186186
}
187187

188188
/**
189-
* Configure session ID length.
189+
* Configure session ID length. To make life easier, we force the PHP defaults because PHP 9 forces them.
190190
*
191-
* To make life easier, we force the PHP defaults. Because PHP9 forces them.
192-
* See https://wiki.php.net/rfc/deprecations_php_8_4#sessionsid_length_and_sessionsid_bits_per_character
191+
* @see https://wiki.php.net/rfc/deprecations_php_8_4#sessionsid_length_and_sessionsid_bits_per_character
193192
*
194193
* @return void
195194
*/
196195
protected function configureSidLength()
197196
{
198-
$bitsPerCharacter = (int) ini_get('session.sid_bits_per_character');
199-
$sidLength = (int) ini_get('session.sid_length');
197+
if ((int) ini_get('session.sid_bits_per_character') !== 4) {
198+
ini_set('session.sid_bits_per_character', '4');
199+
}
200200

201-
// We force the PHP defaults.
202-
if (PHP_VERSION_ID < 90000) {
203-
if ($bitsPerCharacter !== 4) {
204-
ini_set('session.sid_bits_per_character', '4');
205-
}
206-
if ($sidLength !== 32) {
207-
ini_set('session.sid_length', '32');
208-
}
201+
if ((int) ini_get('session.sid_length') !== 32) {
202+
ini_set('session.sid_length', '32');
209203
}
210204

211205
$this->sidRegexp = '[0-9a-f]{32}';

0 commit comments

Comments
 (0)