Merge pull request #7307 from paulbalandan/redis-cache

fix: incorrect metadata querying of Redis cache

Author: kenjis

system/Cache/Handlers/RedisHandler.php

@@ -233,12 +233,11 @@ public function getCacheInfo()
      */
     public function getMetaData(string $key)
     {
-        $key   = static::validateKey($key, $this->prefix);
         $value = $this->get($key);
 
         if ($value !== null) {
             $time = Time::now()->getTimestamp();
-            $ttl  = $this->redis->ttl($key);
+            $ttl  = $this->redis->ttl(static::validateKey($key, $this->prefix));
 
             return [
                 'expire' => $ttl > 0 ? $time + $ttl : null,

tests/system/Cache/Handlers/AbstractHandlerTest.php

@@ -19,7 +19,7 @@
  */
 abstract class AbstractHandlerTest extends CIUnitTestCase
 {
-    protected $handler;
+    protected BaseHandler $handler;
     protected static $key1  = 'key1';
     protected static $key2  = 'key2';
     protected static $key3  = 'key3';

tests/system/Cache/Handlers/RedisHandlerTest.php

@@ -198,6 +198,16 @@ public function testGetCacheInfo()
         $this->assertIsArray($this->handler->getCacheInfo());
     }
 
+    public function testGetMetadataNotNull(): void
+    {
+        $this->handler->save(self::$key1, 'value');
+
+        $metadata = $this->handler->getMetaData(self::$key1);
+
+        $this->assertNotNull($metadata);
+        $this->assertIsArray($metadata);
+    }
+
     public function testIsSupported()
     {
         $this->assertTrue($this->handler->isSupported());