Migrate NoticeCacheBuilder to an eager cache

Author: Cyperghost

wcfsetup/install/files/lib/data/notice/NoticeEditor.class.php

@@ -4,9 +4,7 @@
 
 use wcf\data\DatabaseObjectEditor;
 use wcf\data\IEditableCachedObject;
-use wcf\data\object\type\ObjectTypeCache;
-use wcf\system\cache\builder\ConditionCacheBuilder;
-use wcf\system\cache\builder\NoticeCacheBuilder;
+use wcf\system\cache\eager\NoticeCache;
 use wcf\system\WCF;
 
 /**
@@ -67,11 +65,6 @@ public function setShowOrder($showOrder = 0)
      */
     public static function resetCache()
     {
-        NoticeCacheBuilder::getInstance()->reset();
-        ConditionCacheBuilder::getInstance()->reset([
-            'definitionID' => ObjectTypeCache::getInstance()
-                ->getDefinitionByName('com.woltlab.wcf.condition.notice')
-                ->definitionID,
-        ]);
+        (new NoticeCache())->rebuild();
     }
 }

wcfsetup/install/files/lib/system/cache/builder/NoticeCacheBuilder.class.php

@@ -2,27 +2,28 @@
 
 namespace wcf\system\cache\builder;
 
-use wcf\data\notice\NoticeList;
+use wcf\system\cache\eager\NoticeCache;
 
 /**
  * Caches the enabled notices.
  *
  * @author  Matthias Schmidt
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ *
+ * @deprecated 6.2 use `NoticeCache` instead
  */
-class NoticeCacheBuilder extends AbstractCacheBuilder
+final class NoticeCacheBuilder extends AbstractLegacyCacheBuilder
 {
-    /**
-     * @inheritDoc
-     */
-    protected function rebuild(array $parameters)
+    #[\Override]
+    protected function rebuild(array $parameters): array
     {
-        $noticeList = new NoticeList();
-        $noticeList->getConditionBuilder()->add('isDisabled = ?', [0]);
-        $noticeList->sqlOrderBy = 'showOrder ASC';
-        $noticeList->readObjects();
+        return (new NoticeCache())->getCache();
+    }
 
-        return $noticeList->getObjects();
+    #[\Override]
+    public function reset(array $parameters = [])
+    {
+        (new NoticeCache())->rebuild();
     }
 }

wcfsetup/install/files/lib/system/cache/eager/NoticeCache.class.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace wcf\system\cache\eager;
+
+use wcf\data\notice\Notice;
+use wcf\data\notice\NoticeList;
+
+/**
+ * Caches the enabled notices.
+ *
+ * @author Olaf Braun
+ * @copyright 2001-2025 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ *
+ * @extends AbstractEagerCache<array<int, Notice>>
+ */
+final class NoticeCache extends AbstractEagerCache
+{
+    #[\Override]
+    protected function getCacheData(): array
+    {
+        $noticeList = new NoticeList();
+        $noticeList->getConditionBuilder()->add('isDisabled = ?', [0]);
+        $noticeList->getConditionBuilder()->add('isLegacy = ?', [0]);
+        $noticeList->sqlOrderBy = 'showOrder ASC';
+        $noticeList->readObjects();
+
+        return $noticeList->getObjects();
+    }
+}

wcfsetup/install/files/lib/system/endpoint/controller/core/notices/ChangeShowOrder.class.php

@@ -6,9 +6,8 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use wcf\data\notice\Notice;
-use wcf\data\notice\NoticeCache;
 use wcf\data\notice\NoticeList;
-use wcf\system\cache\builder\NoticeCacheBuilder;
+use wcf\system\cache\eager\NoticeCache;
 use wcf\system\endpoint\IController;
 use wcf\system\endpoint\PostRequest;
 use wcf\system\showOrder\ShowOrderHandler;
@@ -63,6 +62,6 @@ private function saveShowOrder(array $items): void
         }
         WCF::getDB()->commitTransaction();
 
-        NoticeCacheBuilder::getInstance()->reset();
+        (new NoticeCache())->rebuild();
     }
 }

wcfsetup/install/files/lib/system/notice/NoticeHandler.class.php

@@ -3,7 +3,7 @@
 namespace wcf\system\notice;
 
 use wcf\data\notice\Notice;
-use wcf\system\cache\builder\NoticeCacheBuilder;
+use wcf\system\cache\eager\NoticeCache;
 use wcf\system\condition\ConditionHandler;
 use wcf\system\condition\provider\combined\NoticeConditionProvider;
 use wcf\system\condition\type\IGlobalConditionType;
@@ -36,7 +36,7 @@ class NoticeHandler extends SingletonFactory
      */
     protected function init()
     {
-        $this->notices = NoticeCacheBuilder::getInstance()->getData();
+        $this->notices = (new NoticeCache())->getCache();
     }
 
     /**