From 180326ba9fa4804365d4ffd19b2048f7f2fc6562 Mon Sep 17 00:00:00 2001 From: Ken Guest Date: Mon, 28 Nov 2022 16:51:26 +0000 Subject: [PATCH 1/3] CRedisCache should not return null. This will fix deprecation warning of passing null to parameter #1 of type string to unserialize function (PHP 8.1) --- framework/caching/CRedisCache.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/framework/caching/CRedisCache.php b/framework/caching/CRedisCache.php index e9770564df..d54d16c057 100644 --- a/framework/caching/CRedisCache.php +++ b/framework/caching/CRedisCache.php @@ -204,7 +204,10 @@ private function byteLength($str) */ protected function getValue($key) { - return $this->executeCommand('GET',array($key)); + $value=$this->executeCommand('GET',array($key)); + if ($value===null) + return false; + return $value; } /** From f1f1baa88fc7a2a34aeee62677cef3c5d96bb33f Mon Sep 17 00:00:00 2001 From: Ken Guest Date: Mon, 28 Nov 2022 16:55:02 +0000 Subject: [PATCH 2/3] tabs v spaces --- framework/caching/CRedisCache.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/caching/CRedisCache.php b/framework/caching/CRedisCache.php index d54d16c057..15d4488ac6 100644 --- a/framework/caching/CRedisCache.php +++ b/framework/caching/CRedisCache.php @@ -205,9 +205,9 @@ private function byteLength($str) protected function getValue($key) { $value=$this->executeCommand('GET',array($key)); - if ($value===null) - return false; - return $value; + if ($value===null) + return false; + return $value; } /** From c8f0ff71c84f24129e35adfeb92f674ceb3c39ec Mon Sep 17 00:00:00 2001 From: Marco van 't Wout Date: Thu, 15 Dec 2022 17:56:36 +0100 Subject: [PATCH 3/3] Update CHANGELOG --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 46a16074c0..77614772da 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,7 +4,7 @@ Version 1.1.28 under development -------------------------------- -- No changes yet +- Bug #4497: PHP 8.1 compatibility: Fix unserialize null in CRedisCache (kenguest, wtommyw) Version 1.1.27 November 21, 2022 --------------------------------