Rename tolerant cache to ephemeral cache

Cyperghost · Cyperghost · commit e9467d3c390b · 2025-03-17T09:21:29.000+01:00
diff --git a/wcfsetup/install/files/lib/system/background/job/EphemeralCacheRebuildBackgroundJob.class.php b/wcfsetup/install/files/lib/system/background/job/EphemeralCacheRebuildBackgroundJob.class.php
@@ -5,21 +5,21 @@
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Contracts\Cache\ItemInterface;
 use wcf\system\cache\CacheHandler;
-use wcf\system\cache\tolerant\AbstractTolerantCache;
+use wcf\system\cache\ephemeral\AbstractEphemeralCache;
 
 /**
  * @author Olaf Braun
  * @copyright 2001-2025 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.2
  */
-final class TolerantCacheRebuildBackgroundJob extends AbstractUniqueBackgroundJob
+final class EphemeralCacheRebuildBackgroundJob extends AbstractUniqueBackgroundJob
 {
     private readonly ItemInterface $item;
     public function __construct(
         /** @var ItemInterface $item */
         ItemInterface $item,
-        /** @var class-string<AbstractTolerantCache<array|object> */
+        /** @var class-string<AbstractEphemeralCache<array|object> */
         public readonly string $cacheClass,
         /** @var array<string, mixed> */
         public readonly array $parameters = [],
@@ -41,7 +41,7 @@ public function identifier(): string
     #[\Override]
     public function newInstance(): static
     {
-        return new TolerantCacheRebuildBackgroundJob($this->item, $this->cacheClass, $this->parameters);
+        return new EphemeralCacheRebuildBackgroundJob($this->item, $this->cacheClass, $this->parameters);
     }
 
     #[\Override]
@@ -61,10 +61,10 @@ public function perform()
 
         $startTime = microtime(true);
 
-        $tolerantCache = new $this->cacheClass(...$this->parameters);
+        $ephemeralCache = new $this->cacheClass(...$this->parameters);
 
         $save = true;
-        $value = ($tolerantCache)($this->item, $save);
+        $value = ($ephemeralCache)($this->item, $save);
 
         static $setMetadata;
 
diff --git a/wcfsetup/install/files/lib/system/box/WhoWasOnlineBoxController.class.php b/wcfsetup/install/files/lib/system/box/WhoWasOnlineBoxController.class.php
@@ -6,8 +6,8 @@
 use wcf\data\user\online\UserOnline;
 use wcf\data\user\online\UsersOnlineList;
 use wcf\data\user\UserProfile;
+use wcf\system\cache\ephemeral\WhoWasOnlineCache;
 use wcf\system\cache\runtime\UserProfileRuntimeCache;
-use wcf\system\cache\tolerant\WhoWasOnlineCache;
 use wcf\system\event\EventHandler;
 use wcf\system\WCF;
 use wcf\util\DateUtil;
diff --git a/wcfsetup/install/files/lib/system/cache/builder/UserBirthdayCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/UserBirthdayCacheBuilder.class.php
@@ -2,7 +2,7 @@
 
 namespace wcf\system\cache\builder;
 
-use wcf\system\cache\tolerant\UserBirthdayCache;
+use wcf\system\cache\ephemeral\UserBirthdayCache;
 
 /**
  * Caches user birthdays (one cache file per month).
diff --git a/wcfsetup/install/files/lib/system/cache/builder/WhoWasOnlineCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/WhoWasOnlineCacheBuilder.class.php
@@ -2,7 +2,7 @@
 
 namespace wcf\system\cache\builder;
 
-use wcf\system\cache\tolerant\WhoWasOnlineCache;
+use wcf\system\cache\ephemeral\WhoWasOnlineCache;
 
 /**
  * Caches a list of users that visited the website in last 24 hours.
diff --git a/wcfsetup/install/files/lib/system/cache/ephemeral/AbstractEphemeralCache.class.php b/wcfsetup/install/files/lib/system/cache/ephemeral/AbstractEphemeralCache.class.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace wcf\system\cache\tolerant;
+namespace wcf\system\cache\ephemeral;
 
 use Symfony\Contracts\Cache\ItemInterface;
 use wcf\system\background\BackgroundQueueHandler;
-use wcf\system\background\job\TolerantCacheRebuildBackgroundJob;
+use wcf\system\background\job\EphemeralCacheRebuildBackgroundJob;
 use wcf\system\cache\CacheHandler;
 use wcf\system\cache\ICacheCallback;
 use wcf\util\ClassUtil;
@@ -18,7 +18,7 @@
  * @template T of array|object
  * @implements ICacheCallback<T>
  */
-abstract class AbstractTolerantCache implements ICacheCallback
+abstract class AbstractEphemeralCache implements ICacheCallback
 {
     /**
      * @var T
@@ -40,7 +40,7 @@ function (ItemInterface $item, bool &$save) {
                     }
 
                     BackgroundQueueHandler::getInstance()->enqueueIn(
-                        new TolerantCacheRebuildBackgroundJob(
+                        new EphemeralCacheRebuildBackgroundJob(
                             $item,
                             \get_class($this),
                             ClassUtil::getObjectProperties($this, \ReflectionProperty::IS_READONLY)
@@ -63,7 +63,7 @@ private function getCacheKey(): string
         if (!isset($this->cacheName)) {
             /* @see AbstractEagerCache::getCacheKey() */
             $this->cacheName = \str_replace(
-                ['\\', 'system_cache_tolerant_'],
+                ['\\', 'system_cache_ephemeral_'],
                 ['_', ''],
                 \get_class($this)
             );
diff --git a/wcfsetup/install/files/lib/system/cache/ephemeral/UserBirthdayCache.class.php b/wcfsetup/install/files/lib/system/cache/ephemeral/UserBirthdayCache.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace wcf\system\cache\tolerant;
+namespace wcf\system\cache\ephemeral;
 
 use Symfony\Contracts\Cache\ItemInterface;
 use wcf\data\user\User;
@@ -12,9 +12,9 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.2
  *
- * @extends AbstractTolerantCache<array<int, list<int>>>
+ * @extends AbstractEphemeralCache<array<int, list<int>>>
  */
-final class UserBirthdayCache extends AbstractTolerantCache
+final class UserBirthdayCache extends AbstractEphemeralCache
 {
     public function __construct(public readonly int $month)
     {
diff --git a/wcfsetup/install/files/lib/system/cache/ephemeral/WhoWasOnlineCache.class.php b/wcfsetup/install/files/lib/system/cache/ephemeral/WhoWasOnlineCache.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace wcf\system\cache\tolerant;
+namespace wcf\system\cache\ephemeral;
 
 use Symfony\Contracts\Cache\ItemInterface;
 use wcf\system\WCF;
@@ -11,9 +11,9 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.2
  *
- * @extends AbstractTolerantCache<list<int>>
+ * @extends AbstractEphemeralCache<list<int>>
  */
-final class WhoWasOnlineCache extends AbstractTolerantCache
+final class WhoWasOnlineCache extends AbstractEphemeralCache
 {
     #[\Override]
     public function __invoke(ItemInterface $item): array
diff --git a/wcfsetup/install/files/lib/system/user/UserBirthdayCache.class.php b/wcfsetup/install/files/lib/system/user/UserBirthdayCache.class.php
@@ -29,7 +29,7 @@ class UserBirthdayCache extends SingletonFactory
     protected function loadMonth(int $month): void
     {
         if (!\array_key_exists($month, $this->birthdays)) {
-            $this->birthdays[$month] = (new \wcf\system\cache\tolerant\UserBirthdayCache($month))->get();
+            $this->birthdays[$month] = (new \wcf\system\cache\ephemeral\UserBirthdayCache($month))->get();
 
             $data = [
                 'birthdays' => $this->birthdays,

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace wcf\system\cache\tolerant;`
	`3`	`+namespace wcf\system\cache\ephemeral;`
`4`	`4`
`5`	`5`	`use Symfony\Contracts\Cache\ItemInterface;`
`6`	`6`	`use wcf\data\user\User;`
`@@ -12,9 +12,9 @@`
`12`	`12`	`* @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>`
`13`	`13`	`* @since 6.2`
`14`	`14`	`*`
`15`		`- * @extends AbstractTolerantCache<array<int, list<int>>>`
	`15`	`+ * @extends AbstractEphemeralCache<array<int, list<int>>>`
`16`	`16`	`*/`
`17`		`-final class UserBirthdayCache extends AbstractTolerantCache`
	`17`	`+final class UserBirthdayCache extends AbstractEphemeralCache`
`18`	`18`	`{`
`19`	`19`	`public function __construct(public readonly int $month)`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class UserBirthdayCache extends SingletonFactory`
`29`	`29`	`protected function loadMonth(int $month): void`
`30`	`30`	`{`
`31`	`31`	`if (!\array_key_exists($month, $this->birthdays)) {`
`32`		`- $this->birthdays[$month] = (new \wcf\system\cache\tolerant\UserBirthdayCache($month))->get();`
	`32`	`+ $this->birthdays[$month] = (new \wcf\system\cache\ephemeral\UserBirthdayCache($month))->get();`
`33`	`33`
`34`	`34`	`$data = [`
`35`	`35`	`'birthdays' => $this->birthdays,`