From 528132a4b9030df26f7b0f27125a03e252fa383d Mon Sep 17 00:00:00 2001
From: Andreas Kienast <a.fernandez@scripting-base.de>
Date: Mon, 6 Nov 2023 09:53:25 +0100
Subject: [PATCH] [BUGFIX] Update `phpstan/phpstan` to 1.10.41
This commit updates `phpstan/phpstan` to the latest version and fixes
one issue within `RedisSessionBackend` where the Redis API claims to
return a `\Redis` object when calling `->del()`. This indicates a usage
of multi mode, where the delete state cannot get determined.
Also, multi mode is not supported by our session backend, therefore we
handle this case as "not successful" now.
Executed command:
composer require --dev phpstan/phpstan:^1.10.41 -W
Resolves: #102320
Releases: main, 12.4
Change-Id: I6f4edb746c6e23d92d5147cc7c711d8da0309f0f
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/81691
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Andreas Kienast <a.fernandez@scripting-base.de>
Tested-by: Andreas Kienast <a.fernandez@scripting-base.de>
---
composer.json | 2 +-
composer.lock | 12 ++++++------
.../Classes/Session/Backend/RedisSessionBackend.php | 8 +++++++-
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/composer.json b/composer.json
index d72b78c0933e..10f06d21c129 100644
--- a/composer.json
+++ b/composer.json
@@ -112,7 +112,7 @@
"friendsofphp/php-cs-fixer": "^3.37.1",
"friendsoftypo3/phpstan-typo3": "^0.9.0",
"php-webdriver/webdriver": "^1.14.0",
- "phpstan/phpstan": "^1.10.40",
+ "phpstan/phpstan": "^1.10.41",
"phpstan/phpstan-phpunit": "^1.3.14",
"phpunit/phpunit": "^10.4.0",
"sokil/php-isocodes-db-i18n": "^4.0.13",
diff --git a/composer.lock b/composer.lock
index 3f9dc7325f0f..3156d228efe6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "fe99fbd9333ad5d709392daeda21ac8a",
+ "content-hash": "84005f906821d20927dcfa1889c25adb",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -6688,16 +6688,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.10.40",
+ "version": "1.10.41",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "93c84b5bf7669920d823631e39904d69b9c7dc5d"
+ "reference": "c6174523c2a69231df55bdc65b61655e72876d76"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/93c84b5bf7669920d823631e39904d69b9c7dc5d",
- "reference": "93c84b5bf7669920d823631e39904d69b9c7dc5d",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6174523c2a69231df55bdc65b61655e72876d76",
+ "reference": "c6174523c2a69231df55bdc65b61655e72876d76",
"shasum": ""
},
"require": {
@@ -6746,7 +6746,7 @@
"type": "tidelift"
}
],
- "time": "2023-10-30T14:48:31+00:00"
+ "time": "2023-11-05T12:57:57+00:00"
},
{
"name": "phpstan/phpstan-phpunit",
diff --git a/typo3/sysext/core/Classes/Session/Backend/RedisSessionBackend.php b/typo3/sysext/core/Classes/Session/Backend/RedisSessionBackend.php
index 716cf94ec805..336c2ba8b62e 100644
--- a/typo3/sysext/core/Classes/Session/Backend/RedisSessionBackend.php
+++ b/typo3/sysext/core/Classes/Session/Backend/RedisSessionBackend.php
@@ -149,7 +149,13 @@ class RedisSessionBackend implements SessionBackendInterface, HashableSessionBac
public function remove(string $sessionId): bool
{
$this->initializeConnection();
- return $this->redis->del($this->getSessionKeyName($this->hash($sessionId))) >= 1;
+
+ $deleteResult = $this->redis->del($this->getSessionKeyName($this->hash($sessionId)));
+
+ // Redis delete result is either `int`, `false` or a `\Redis` multi mode object, where delete state cannot get
+ // determined. Multi mode is not even supported by this session backend at all, therefore we handle this case as
+ // "not successful".
+ return is_int($deleteResult) && $deleteResult >= 1;
}
/**
--
GitLab