Revert the bad merge of these two files

Author: dtdesign

com.woltlab.wcf/package.xml

@@ -5,8 +5,8 @@
 		<packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
 		<packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
 		<isapplication>1</isapplication>
-		<version>6.1.11</version>
-		<date>2025-06-18</date>
+		<version>6.2.0 dev 1</version>
+		<date>2025-03-24</date>
 	</packageinformation>
 
 	<authorinformation>
@@ -50,7 +50,11 @@
 		<instruction type="script">acp/install_com.woltlab.wcf_step2.php</instruction>
 	</instructions>
 
-	<instructions type="update" fromversion="6.1.10">
-		<instruction type="file">files_update.tar</instruction>
-	</instructions>
+	<!-- 
+	Required order of the following steps for the update to 6.2:
+	<instruction type="script">acp/update_com.woltlab.wcf_6.2_backgroundJob.php</instruction>
+	<instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_62_step1.php</instruction>
+	<instruction type="script">acp/update_com.woltlab.wcf_6.2_contactOptions.php</instruction>
+	<instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_62_step2.php</instruction>
+	-->
 </package>

wcfsetup/install/files/lib/system/WCF.class.php

@@ -10,14 +10,14 @@
 use wcf\data\page\Page;
 use wcf\system\application\ApplicationHandler;
 use wcf\system\application\IApplication;
+use wcf\system\benchmark\Benchmark;
 use wcf\system\box\BoxHandler;
-use wcf\system\cache\builder\CoreObjectCacheBuilder;
 use wcf\system\cache\builder\PackageUpdateCacheBuilder;
+use wcf\system\cache\eager\CoreObjectCache;
 use wcf\system\database\MySQLDatabase;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\ErrorException;
 use wcf\system\exception\IPrintableException;
-use wcf\system\exception\ParentClassException;
 use wcf\system\exception\SystemException;
 use wcf\system\language\LanguageFactory;
 use wcf\system\package\command\RebuildBootstrapper;
@@ -31,6 +31,7 @@
 use wcf\system\template\EmailTemplateEngine;
 use wcf\system\template\TemplateEngine;
 use wcf\system\user\storage\UserStorageHandler;
+use wcf\system\user\UserProfileHandler;
 use wcf\util\DirectoryUtil;
 use wcf\util\FileUtil;
 use wcf\util\StringUtil;
@@ -79,7 +80,7 @@
 \mb_language('uni');
 
 // define current woltlab suite version
-\define('WCF_VERSION', '6.1.11');
+\define('WCF_VERSION', '6.2.0 dev 1');
 
 // define current unix timestamp
 \define('TIME_NOW', \time());
@@ -98,6 +99,9 @@
  * @author  Marcel Werk
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ *
+ * @method static Benchmark getBenchmark()
+ * @method static UserProfileHandler getUserProfileHandler()
  */
 class WCF
 {
@@ -121,7 +125,7 @@ class WCF
 
     /**
      * list of autoload directories
-     * @var array
+     * @var array<string, string>
      */
     protected static $autoloadDirectories = [
         'wcf' => WCF_DIR . 'lib/',
@@ -135,9 +139,10 @@ class WCF
 
     /**
      * list of cached core objects
-     * @var string[]
+     *
+     * @var array<string, class-string<SingletonFactory>>
      */
-    protected static $coreObjectCache = [];
+    protected static array $coreObjectCache;
 
     /**
      * database object
@@ -175,7 +180,7 @@ class WCF
      */
     protected static $zendOpcacheEnabled;
 
-    public const BOOTSTRAP_LOADER = \WCF_DIR . '/lib/bootstrap.php';
+    public const BOOTSTRAP_LOADER = \WCF_DIR . 'lib/bootstrap.php';
 
     /**
      * Calls all init functions of the WCF class.
@@ -229,11 +234,14 @@ final protected function runBootstrappers(): void
      *
      * You *must* not create output in here under normal circumstances, as it might get eaten
      * when gzip is enabled.
+     *
+     * @return void
      */
     public static function destruct()
     {
         try {
             // database has to be initialized
+            // @phpstan-ignore function.alreadyNarrowedType
             if (!\is_object(self::$dbObj)) {
                 return;
             }
@@ -253,6 +261,7 @@ public static function destruct()
             }
 
             // update session
+            // @phpstan-ignore function.alreadyNarrowedType
             if (\is_object(self::getSession())) {
                 self::getSession()->update();
             }
@@ -318,7 +327,7 @@ final public static function getTPL()
     /**
      * Calls the show method on the given exception.
      */
-    final public static function handleException(\Throwable $e)
+    final public static function handleException(\Throwable $e): never
     {
         // backwards compatibility
         if ($e instanceof IPrintableException) {
@@ -338,6 +347,8 @@ final public static function handleException(\Throwable $e)
         @\header('HTTP/1.1 500 Internal Server Error');
         try {
             \wcf\functions\exception\printThrowable($e);
+
+            exit;
         } catch (\Throwable $e2) {
             echo "<pre>An Exception was thrown while handling an Exception:\n\n";
             echo \preg_replace('/Database->__construct\(.*\)/', 'Database->__construct(...)', $e2);
@@ -358,11 +369,11 @@ final public static function handleException(\Throwable $e)
      * @param int $line
      * @throws  ErrorException
      */
-    final public static function handleError($severity, $message, $file, $line): void
+    final public static function handleError($severity, $message, $file, $line): bool
     {
         // this is necessary for the shut-up operator
         if (!(\error_reporting() & $severity)) {
-            return;
+            return true;
         }
 
         throw new ErrorException($message, 0, $severity, $file, $line);
@@ -412,6 +423,7 @@ protected function loadOptions(): void
             if (!\is_writable($filename)) {
                 FileUtil::makeWritable($filename);
 
+                // @phpstan-ignore booleanNot.alwaysTrue
                 if (!\is_writable($filename)) {
                     throw new SystemException("The option file '" . $filename . "' is not writable.");
                 }
@@ -500,6 +512,9 @@ protected function defineLegacyOptions(): void
 
         // The option for the SFS action has been converted into a general option with version 6.1.
         \define('BLACKLIST_SFS_ACTION', 'disable');
+
+        // The option to show an article counter in the message sidebar was removed with version 6.2.
+        \define('MESSAGE_SIDEBAR_ENABLE_ARTICLES', 0);
     }
 
     /**
@@ -639,6 +654,7 @@ protected function loadApplication(Application $application, bool $isDependentAp
                 $packageDir = FileUtil::getRealPath(WCF_DIR . $relativePath);
                 self::$autoloadDirectories[$abbreviation] = $packageDir . 'lib/';
 
+                // @phpstan-ignore if.alwaysFalse
                 if (\class_exists($className)) {
                     // the class can now be found, update the `packageDir` value
                     (new PackageEditor($package))->update(['packageDir' => $relativePath]);
@@ -739,7 +755,7 @@ protected function initCoreObjects(): void
             return;
         }
 
-        self::$coreObjectCache = CoreObjectCacheBuilder::getInstance()->getData();
+        self::$coreObjectCache = (new CoreObjectCache())->getCache();
     }
 
     /**
@@ -825,7 +841,7 @@ final public static function setLanguage(int $languageID): void
     final public static function autoload(string $className): void
     {
         $className = \strtr($className, '\\', '/');
-        if (($slashPos = \strpos($className, '/')) !== null) {
+        if (($slashPos = \strpos($className, '/')) !== false) {
             $applicationPrefix = \substr($className, 0, $slashPos);
             if (isset(self::$autoloadDirectories[$applicationPrefix])) {
                 $classPath = self::$autoloadDirectories[$applicationPrefix] . \substr($className, $slashPos + 1) . '.class.php';
@@ -849,7 +865,7 @@ final public static function autoloadDebug(string $className): void
         // logic cannot be moved into a shared function, because it
         // measurably reduced autoloader performance.
         $className = \strtr($className, '\\', '/');
-        if (($slashPos = \strpos($className, '/')) !== null) {
+        if (($slashPos = \strpos($className, '/')) !== false) {
             $applicationPrefix = \substr($className, 0, $slashPos);
             if (isset(self::$autoloadDirectories[$applicationPrefix])) {
                 $classPath = self::$autoloadDirectories[$applicationPrefix] . \substr($className, $slashPos + 1) . '.class.php';
@@ -872,7 +888,8 @@ final public static function autoloadDebug(string $className): void
     }
 
     /**
-     * @inheritDoc
+     * @param mixed[] $arguments
+     * @return ?object
      */
     final public function __call(string $name, array $arguments)
     {
@@ -887,9 +904,9 @@ final public function __call(string $name, array $arguments)
     /**
      * Returns dynamically loaded core objects.
      *
-     * @param array $arguments
-     * @return  object
-     * @throws  SystemException
+     * @param mixed[] $arguments
+     * @return ?object
+     * @throws SystemException
      */
     final public static function __callStatic(string $name, array $arguments)
     {
@@ -905,20 +922,18 @@ final public static function __callStatic(string $name, array $arguments)
         }
 
         if (\class_exists($objectName)) {
-            if (!\is_subclass_of($objectName, SingletonFactory::class)) {
-                throw new ParentClassException($objectName, SingletonFactory::class);
-            }
-
             self::$coreObject[$className] = \call_user_func([$objectName, 'getInstance']);
 
             return self::$coreObject[$className];
         }
+
+        return null;
     }
 
     /**
      * Searches for cached core object definition.
      *
-     * @return  string|null
+     * @return  class-string<SingletonFactory>|null
      */
     final protected static function getCoreObject(string $className)
     {
@@ -987,6 +1002,7 @@ public static function getActivePath(): string
     }
 
     /**
+     * @param string $fragment
      * @deprecated 5.5 - Put a '#' followed by the fragment as the anchor's href. Make sure to |rawurlencode any variables that may contain special characters.
      */
     public function getAnchor($fragment): string