ICacheSource::getCacheLifetime() requires a second parameter to calculate the expiration time of the cache

Author: Cyperghost

wcfsetup/install/files/lib/system/cache/source/DiskCacheSource.class.php

@@ -159,8 +159,12 @@ private function readCache(string $filename): mixed
     }
 
     #[\Override]
-    public function getCacheLifetime(string $cacheName): ?int
+    public function getExpirationTime(string $cacheName, int $maxLifetime): ?int
     {
+        if ($maxLifetime === 0) {
+            return \PHP_INT_MAX;
+        }
+
         $filename = $this->getFilename($cacheName);
 
         if (!\file_exists($filename)) {
@@ -171,6 +175,6 @@ public function getCacheLifetime(string $cacheName): ?int
             return null;
         }
 
-        return \filemtime($filename);
+        return \filemtime($filename) + $maxLifetime;
     }
 }

wcfsetup/install/files/lib/system/cache/source/ICacheSource.class.php

@@ -43,7 +43,9 @@ public function get($cacheName, $maxLifetime);
     public function set($cacheName, $value, $maxLifetime);
 
     /**
-     * Returns the cache lifetime for a specific cache.
+     * Returns the timestamp when the cache expires.
+     * Or `null` if the cache does not exist or is empty.
+     * `\PHP_INT_MAX` means the cache never expires.
      */
-    public function getCacheLifetime(string $cacheName): ?int;
+    public function getExpirationTime(string $cacheName, int $maxLifetime): ?int;
 }

wcfsetup/install/files/lib/system/cache/source/RedisCacheSource.class.php

@@ -186,7 +186,7 @@ public function getRedis()
     }
 
     #[\Override]
-    public function getCacheLifetime(string $cacheName): ?int
+    public function getExpirationTime(string $cacheName, int $maxLifetime): ?int
     {
         $parts = \explode('-', $cacheName, 2);
 
@@ -197,7 +197,15 @@ public function getCacheLifetime(string $cacheName): ?int
         }
 
         // -2 means that the key does not exist
+        if ($ttl === -2) {
+            return null;
+        }
+
         // -1 means that the key exists but does not have an expiration date.
-        return $ttl > 0 ? $ttl : null;
+        if ($ttl === -1) {
+            return \PHP_INT_MAX;
+        }
+
+        return $ttl;
     }
 }

wcfsetup/install/files/lib/system/cache/tolerant/AbstractTolerantCache.class.php

@@ -103,11 +103,6 @@ final public function rebuild(): void
             $newCacheData,
             0
         );
-
-        BackgroundQueueHandler::getInstance()->enqueueAt(
-            [new TolerantCacheRebuildBackgroundJob(\get_class($this), $this->getProperties())],
-            $this->nextRebuildTime()
-        );
     }
 
     /**
@@ -117,10 +112,15 @@ abstract protected function rebuildCacheData(): array | object;
 
     final public function nextRebuildTime(): int
     {
-        $cacheTime = CacheHandler::getInstance()->getCacheSource()->getCacheLifetime($this->getCacheKey());
+        $cacheTime = CacheHandler::getInstance()->getCacheSource()->getExpirationTime(
+            $this->getCacheKey(),
+            $this->getLifetime()
+        );
+
         if ($cacheTime === null) {
             return \TIME_NOW;
         }
+
         return $cacheTime + ($this->getLifetime() - 60);
     }