Minor clean up, fix naming and descriptions

Author: dtdesign

wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php

@@ -117,7 +117,10 @@ protected function stepPrepare(): ResponseInterface
 
         // mark package as tainted if it is an app
         if ($package->isApplication) {
-            (new MarkApplicationAsTainted(ApplicationHandler::getInstance()->getApplicationByID($package->packageID)))();
+            $application = ApplicationHandler::getInstance()->getApplicationByID($package->packageID);
+            \assert($application !== null);
+
+            (new MarkApplicationAsTainted($application))();
         }
 
         $this->installation->nodeBuilder->purgeNodes();

wcfsetup/install/files/lib/acp/form/RescueModeForm.class.php

@@ -3,7 +3,7 @@
 namespace wcf\acp\form;
 
 use Laminas\Diactoros\Response\RedirectResponse;
-use wcf\command\application\RebuildApplicationsCookieDomain;
+use wcf\command\application\SynchronizeCookieDomain;
 use wcf\data\application\Application;
 use wcf\data\application\ApplicationEditor;
 use wcf\data\application\ApplicationList;
@@ -333,7 +333,7 @@ public function save()
             ]);
         }
 
-        (new RebuildApplicationsCookieDomain())();
+        (new SynchronizeCookieDomain())();
 
         // reload currently active application to avoid outdated cache data
         $application = ApplicationHandler::getInstance()->getActiveApplication();

wcfsetup/install/files/lib/command/application/MarkApplicationAsTainted.class.php

@@ -7,8 +7,8 @@
 use wcf\system\cache\eager\ApplicationCache;
 
 /**
- * Marking an application as tainted, prevents it from loading.
- * This should be called during the uninstallation.
+ * Marking an application as tainted prevents it from being loaded during its
+ * uninstallation. This MUST NOT be called outside of an active uninstallation.
  *
  * @author Olaf Braun
  * @copyright 2001-2025 WoltLab GmbH
@@ -17,9 +17,9 @@
  */
 final class MarkApplicationAsTainted
 {
-    public function __construct(public readonly Application $application)
-    {
-    }
+    public function __construct(
+        public readonly Application $application
+    ) {}
 
     public function __invoke(): void
     {

…ebuildApplicationsCookieDomain.class.php …cation/SynchronizeCookieDomain.class.phpwcfsetup/install/files/lib/command/application/RebuildApplicationsCookieDomain.class.php renamed to wcfsetup/install/files/lib/command/application/SynchronizeCookieDomain.class.php wcfsetup/install/files/lib/command/application/RebuildApplicationsCookieDomain.class.php renamed to wcfsetup/install/files/lib/command/application/SynchronizeCookieDomain.class.php

@@ -10,19 +10,15 @@
 use wcf\system\WCF;
 
 /**
- * Rebuilds application cookie domains.
+ * Synchronizes the cookie domain for all installed apps.
  *
  * @author Olaf Braun
  * @copyright 2001-2025 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.3
  */
-final class RebuildApplicationsCookieDomain
+final class SynchronizeCookieDomain
 {
-    public function __construct()
-    {
-    }
-
     public function __invoke(): void
     {
         $sql = "UPDATE  wcf1_application

wcfsetup/install/files/lib/data/application/ApplicationAction.class.php

@@ -3,7 +3,7 @@
 namespace wcf\data\application;
 
 use wcf\command\application\MarkApplicationAsTainted;
-use wcf\command\application\RebuildApplicationsCookieDomain;
+use wcf\command\application\SynchronizeCookieDomain;
 use wcf\data\AbstractDatabaseObjectAction;
 
 /**
@@ -27,11 +27,11 @@ class ApplicationAction extends AbstractDatabaseObjectAction
      *
      * @return void
      *
-     * @deprecated 6.3 use `RebuildApplicationsCookieDomain`
+     * @deprecated 6.3 use `SynchronizeCookieDomain`
      */
     public function rebuild()
     {
-        (new RebuildApplicationsCookieDomain())();
+        (new SynchronizeCookieDomain())();
     }
 
     /**

wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php

@@ -2,7 +2,7 @@
 
 namespace wcf\system\application;
 
-use wcf\command\application\RebuildApplicationsCookieDomain;
+use wcf\command\application\SynchronizeCookieDomain;
 use wcf\data\application\Application;
 use wcf\data\package\Package;
 use wcf\system\cache\eager\ApplicationCache;
@@ -19,22 +19,18 @@
 /**
  * Handles multi-application environments.
  *
- * @author  Alexander Ebert
- * @copyright   2001-2019 WoltLab GmbH
+ * @author Alexander Ebert
+ * @copyright 2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  */
 final class ApplicationHandler extends SingletonFactory
 {
-    /**
-     * application cache
-     */
-    protected ApplicationCacheData $cache;
+    private ApplicationCacheData $cache;
 
     /**
-     * list of page URLs
      * @var string[]
      */
-    protected array $pageURLs = [];
+    private array $pageURLs = [];
 
     /**
      * Initializes cache.
@@ -59,8 +55,6 @@ public function getApplication(string $abbreviation): ?Application
     /**
      * Returns an application delivered by the package with the given id or `null`
      * if no such application exists.
-     *
-     * @since   3.0
      */
     public function getApplicationByID(int $packageID): ?Application
     {
@@ -117,7 +111,7 @@ public function getActiveApplication(): Application
     /**
      * Returns a list of dependent applications.
      *
-     * @return  Application[]
+     * @return Application[]
      */
     public function getDependentApplications(): array
     {
@@ -135,11 +129,11 @@ public function getDependentApplications(): array
     /**
      * Returns a list of all active applications.
      *
-     * @return  Application[]
+     * @return Application[]
      */
     public function getApplications(): array
     {
-        return $this->cache->application;
+        return $this->cache->applications;
     }
 
     /**
@@ -153,12 +147,11 @@ public function getAbbreviation(int $packageID): ?string
     /**
      * Returns the list of application abbreviations.
      *
-     * @return      string[]
-     * @since       3.1
+     * @return string[]
      */
     public function getAbbreviations(): array
     {
-        return \array_keys($this->cache->abbreviation);
+        return \array_keys($this->cache->abbreviations);
     }
 
     /**
@@ -188,7 +181,6 @@ public function isInternalURL(string $url): bool
     /**
      * Always returns false.
      *
-     * @since       3.1
      * @deprecated  5.4
      */
     public function isMultiDomainSetup(): bool
@@ -197,12 +189,9 @@ public function isMultiDomainSetup(): bool
     }
 
     /**
-     * @since 5.2
      * @deprecated 5.5 - This function is a noop. The 'active' status is determined live.
      */
-    public function rebuildActiveApplication(): void
-    {
-    }
+    public function rebuildActiveApplication(): void {}
 
     /**
      * @since 6.0
@@ -217,7 +206,7 @@ public function getDomainName(): string
      */
     public static function rebuild(): void
     {
-        (new RebuildApplicationsCookieDomain())();
+        (new SynchronizeCookieDomain())();
     }
 
     /**
@@ -228,7 +217,6 @@ public static function rebuild(): void
      * queries, for example.
      *
      * @param $skipCache if `true`, no caches will be used and relevant application packages will be read from database directly
-     * @since   5.2
      */
     public static function insertRealDatabaseTableNames(string $string, bool $skipCache = false): string
     {
@@ -240,7 +228,7 @@ public static function insertRealDatabaseTableNames(string $string, bool $skipCa
         }
 
         if ($skipCache) {
-            $sql = "SELECT package 
+            $sql = "SELECT package
                     FROM   wcf" . WCF_N . "_package
                     WHERE  isApplication = ?";
             $statement = WCF::getDB()->prepareUnmanaged($sql);

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

@@ -21,8 +21,8 @@ protected function rebuild(array $parameters): array
         $cache = (new ApplicationCache())->getCache();
 
         return [
-            'application' => $cache->application,
-            'abbreviation' => $cache->abbreviation,
+            'application' => $cache->applications,
+            'abbreviation' => $cache->abbreviations,
         ];
     }
 

wcfsetup/install/files/lib/system/cache/eager/data/ApplicationCacheData.class.php

@@ -14,20 +14,20 @@ final class ApplicationCacheData
 {
     public function __construct(
         /** @var array<int, Application> */
-        public readonly array $application,
+        public readonly array $applications,
         /** @var array<string, int> */
-        public readonly array $abbreviation,
+        public readonly array $abbreviations,
     ) {
     }
 
     public function getApplication(int $packageID): ?Application
     {
-        return $this->application[$packageID] ?? null;
+        return $this->applications[$packageID] ?? null;
     }
 
     public function getApplicationByAbbreviation(string $abbreviation): ?Application
     {
-        $packageID = $this->abbreviation[$abbreviation] ?? null;
+        $packageID = $this->abbreviations[$abbreviation] ?? null;
         if ($packageID === null) {
             return null;
         }
@@ -37,6 +37,6 @@ public function getApplicationByAbbreviation(string $abbreviation): ?Application
 
     public function getAbbreviationByPackageID(int $packageID): ?string
     {
-        return \array_search($packageID, $this->abbreviation) ?: null;
+        return \array_search($packageID, $this->abbreviations) ?: null;
     }
 }