Merge branch '6.1' into 6.2

Author: dtdesign

com.woltlab.wcf/fileDelete.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.2.0 dev 1</version>
-		<date>2025-03-24</date>
+		<version>6.1.11</version>
+		<date>2025-06-18</date>
 	</packageinformation>
 
 	<authorinformation>
@@ -50,11 +50,7 @@
 		<instruction type="script">acp/install_com.woltlab.wcf_step2.php</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>
-	-->
+	<instructions type="update" fromversion="6.1.10">
+		<instruction type="file">files_update.tar</instruction>
+	</instructions>
 </package>

com.woltlab.wcf/package.xml

@@ -363,7 +363,7 @@ public function assignVariables()
         parent::assignVariables();
 
         $signatureProcessor = new HtmlUpcastProcessor();
-        $signatureProcessor->process($this->signature, 'com.woltlab.wcf.user.signature', $this->user->userID);
+        $signatureProcessor->process($this->signature ?: '', 'com.woltlab.wcf.user.signature', $this->user->userID);
 
         WCF::getTPL()->assign([
             'userID' => $this->user->userID,

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

@@ -52,7 +52,7 @@
  * @property-read   int $disableAvatar          is `1` if the user's avatar has been disabled, otherwise `0`
  * @property-read   string $disableAvatarReason        reason why the user's avatar is disabled
  * @property-read   int $disableAvatarExpires       timestamp at which the user's avatar will automatically be enabled again
- * @property-read   string $signature          text of the user's signature
+ * @property-read   string|null $signature          text of the user's signature
  * @property-read   int $signatureEnableHtml        is `1` if HTML will rendered in the user's signature, otherwise `0`
  * @property-read   int $disableSignature       is `1` if the user's signature has been disabled, otherwise `0`
  * @property-read   string $disableSignatureReason     reason why the user's signature is disabled

wcfsetup/install/files/lib/data/user/User.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,7 +31,6 @@
 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;
@@ -80,7 +79,7 @@
 \mb_language('uni');
 
 // define current woltlab suite version
-\define('WCF_VERSION', '6.2.0 dev 1');
+\define('WCF_VERSION', '6.1.11');
 
 // define current unix timestamp
 \define('TIME_NOW', \time());
@@ -99,9 +98,6 @@
  * @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
 {
@@ -125,7 +121,7 @@ class WCF
 
     /**
      * list of autoload directories
-     * @var array<string, string>
+     * @var array
      */
     protected static $autoloadDirectories = [
         'wcf' => WCF_DIR . 'lib/',
@@ -139,10 +135,9 @@ class WCF
 
     /**
      * list of cached core objects
-     *
-     * @var array<string, class-string<SingletonFactory>>
+     * @var string[]
      */
-    protected static array $coreObjectCache;
+    protected static $coreObjectCache = [];
 
     /**
      * database object
@@ -180,7 +175,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.
@@ -234,14 +229,11 @@ 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;
             }
@@ -261,7 +253,6 @@ public static function destruct()
             }
 
             // update session
-            // @phpstan-ignore function.alreadyNarrowedType
             if (\is_object(self::getSession())) {
                 self::getSession()->update();
             }
@@ -327,7 +318,7 @@ final public static function getTPL()
     /**
      * Calls the show method on the given exception.
      */
-    final public static function handleException(\Throwable $e): never
+    final public static function handleException(\Throwable $e)
     {
         // backwards compatibility
         if ($e instanceof IPrintableException) {
@@ -347,8 +338,6 @@ final public static function handleException(\Throwable $e): never
         @\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);
@@ -369,11 +358,11 @@ final public static function handleException(\Throwable $e): never
      * @param int $line
      * @throws  ErrorException
      */
-    final public static function handleError($severity, $message, $file, $line): bool
+    final public static function handleError($severity, $message, $file, $line): void
     {
         // this is necessary for the shut-up operator
         if (!(\error_reporting() & $severity)) {
-            return true;
+            return;
         }
 
         throw new ErrorException($message, 0, $severity, $file, $line);
@@ -423,7 +412,6 @@ 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.");
                 }
@@ -512,9 +500,6 @@ 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);
     }
 
     /**
@@ -654,7 +639,6 @@ 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]);
@@ -755,7 +739,7 @@ protected function initCoreObjects(): void
             return;
         }
 
-        self::$coreObjectCache = (new CoreObjectCache())->getCache();
+        self::$coreObjectCache = CoreObjectCacheBuilder::getInstance()->getData();
     }
 
     /**
@@ -841,7 +825,7 @@ final public static function setLanguage(int $languageID): void
     final public static function autoload(string $className): void
     {
         $className = \strtr($className, '\\', '/');
-        if (($slashPos = \strpos($className, '/')) !== false) {
+        if (($slashPos = \strpos($className, '/')) !== null) {
             $applicationPrefix = \substr($className, 0, $slashPos);
             if (isset(self::$autoloadDirectories[$applicationPrefix])) {
                 $classPath = self::$autoloadDirectories[$applicationPrefix] . \substr($className, $slashPos + 1) . '.class.php';
@@ -865,7 +849,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, '/')) !== false) {
+        if (($slashPos = \strpos($className, '/')) !== null) {
             $applicationPrefix = \substr($className, 0, $slashPos);
             if (isset(self::$autoloadDirectories[$applicationPrefix])) {
                 $classPath = self::$autoloadDirectories[$applicationPrefix] . \substr($className, $slashPos + 1) . '.class.php';
@@ -888,8 +872,7 @@ final public static function autoloadDebug(string $className): void
     }
 
     /**
-     * @param mixed[] $arguments
-     * @return ?object
+     * @inheritDoc
      */
     final public function __call(string $name, array $arguments)
     {
@@ -904,9 +887,9 @@ final public function __call(string $name, array $arguments)
     /**
      * Returns dynamically loaded core objects.
      *
-     * @param mixed[] $arguments
-     * @return ?object
-     * @throws SystemException
+     * @param array $arguments
+     * @return  object
+     * @throws  SystemException
      */
     final public static function __callStatic(string $name, array $arguments)
     {
@@ -922,18 +905,20 @@ 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  class-string<SingletonFactory>|null
+     * @return  string|null
      */
     final protected static function getCoreObject(string $className)
     {
@@ -1002,7 +987,6 @@ 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

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

@@ -14,10 +14,7 @@
             echo $err;
         }
     }
-    trigger_error(
-        $err,
-        E_USER_ERROR
-    );
+    throw new RuntimeException($err);
 }
 
 require_once __DIR__ . '/composer/autoload_real.php';

wcfsetup/install/files/lib/system/api/autoload.php

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.12.3](https://github.com/brick/math/releases/tag/0.12.3) - 2025-02-28
+
+✨ **New features**
+
+- `BigDecimal::getPrecision()` Returns the number of significant digits in a decimal number
+
+## [0.12.2](https://github.com/brick/math/releases/tag/0.12.2) - 2025-02-26
+
+⚡️ **Performance improvements**
+
+- Division in `NativeCalculator` is now faster for small divisors, thanks to [@Izumi-kun](https://github.com/Izumi-kun) in [#87](https://github.com/brick/math/pull/87).
+
+👌 **Improvements**
+
+- Add missing `RoundingNecessaryException` to the `@throws` annotation of `BigNumber::of()`
+
 ## [0.12.1](https://github.com/brick/math/releases/tag/0.12.1) - 2023-11-29
 
 ⚡️ **Performance improvements**

wcfsetup/install/files/lib/system/api/brick/math/CHANGELOG.md

@@ -24,7 +24,7 @@
     "require-dev": {
         "phpunit/phpunit": "^10.1",
         "php-coveralls/php-coveralls": "^2.2",
-        "vimeo/psalm": "5.16.0"
+        "vimeo/psalm": "6.8.8"
     },
     "autoload": {
         "psr-4": {

wcfsetup/install/files/lib/system/api/brick/math/composer.json

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="6.8.8@1361cd33008feb3ae2b4a93f1860e14e538ec8c2">
+  <file src="src/BigInteger.php">
+    <FalsableReturnStatement>
+      <code><![CDATA[\hex2bin($hex)]]></code>
+    </FalsableReturnStatement>
+    <InvalidFalsableReturnType>
+      <code><![CDATA[string]]></code>
+    </InvalidFalsableReturnType>
+  </file>
+  <file src="src/Exception/DivisionByZeroException.php">
+    <ClassMustBeFinal>
+      <code><![CDATA[DivisionByZeroException]]></code>
+    </ClassMustBeFinal>
+  </file>
+  <file src="src/Exception/IntegerOverflowException.php">
+    <ClassMustBeFinal>
+      <code><![CDATA[IntegerOverflowException]]></code>
+    </ClassMustBeFinal>
+  </file>
+  <file src="src/Exception/NegativeNumberException.php">
+    <ClassMustBeFinal>
+      <code><![CDATA[NegativeNumberException]]></code>
+    </ClassMustBeFinal>
+  </file>
+  <file src="src/Exception/NumberFormatException.php">
+    <ClassMustBeFinal>
+      <code><![CDATA[NumberFormatException]]></code>
+    </ClassMustBeFinal>
+  </file>
+  <file src="src/Exception/RoundingNecessaryException.php">
+    <ClassMustBeFinal>
+      <code><![CDATA[RoundingNecessaryException]]></code>
+    </ClassMustBeFinal>
+  </file>
+  <file src="src/Internal/Calculator/BcMathCalculator.php">
+    <ClassMustBeFinal>
+      <code><![CDATA[BcMathCalculator]]></code>
+    </ClassMustBeFinal>
+  </file>
+  <file src="src/Internal/Calculator/GmpCalculator.php">
+    <ClassMustBeFinal>
+      <code><![CDATA[GmpCalculator]]></code>
+    </ClassMustBeFinal>
+  </file>
+  <file src="src/Internal/Calculator/NativeCalculator.php">
+    <ClassMustBeFinal>
+      <code><![CDATA[NativeCalculator]]></code>
+    </ClassMustBeFinal>
+    <InvalidOperand>
+      <code><![CDATA[$a * $b]]></code>
+      <code><![CDATA[$a * 1]]></code>
+      <code><![CDATA[$a + $b]]></code>
+      <code><![CDATA[$b * 1]]></code>
+      <code><![CDATA[$b * 1]]></code>
+      <code><![CDATA[$blockA * $blockB + $carry]]></code>
+      <code><![CDATA[$blockA + $blockB]]></code>
+      <code><![CDATA[$blockA + $blockB + $carry]]></code>
+      <code><![CDATA[$blockA - $blockB]]></code>
+      <code><![CDATA[$blockA - $blockB - $carry]]></code>
+      <code><![CDATA[$carry]]></code>
+      <code><![CDATA[$mul % $complement]]></code>
+      <code><![CDATA[$mul - $value]]></code>
+      <code><![CDATA[$nb - 1]]></code>
+      <code><![CDATA[$sum += $complement]]></code>
+      <code><![CDATA[($mul - $value) / $complement]]></code>
+      <code><![CDATA[($nb - 1) * 10]]></code>
+    </InvalidOperand>
+  </file>
+</files>