Merge branch '6.2' of https://github.com/WoltLab/WCF into 6.2

Author: BurntimeX

phpstan-baseline.neon

@@ -1,11 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: '#^Variable \$this might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: wcfsetup/install/files/acp/update_com.woltlab.wcf_6.1_spider_step1.php
-
 		-
 			message: '#^Property wcf\\acp\\form\\AbstractCategoryAddForm\:\:\$categoryNodeTree \(wcf\\data\\category\\UncachedCategoryNodeTree\) does not accept wcf\\data\\category\\CategoryNodeTree\.$#'
 			identifier: assign.propertyType

wcfsetup/install/files/lib/data/user/group/UserGroupAction.class.php

@@ -84,6 +84,8 @@ public function update()
 
     /**
      * Validates the 'copy' action.
+     *
+     * @return void
      * @deprecated 6.2 Use `CopyUserGroup` instead.
      */
     public function validateCopy()
@@ -105,6 +107,8 @@ public function validateCopy()
 
     /**
      * Copies a user group.
+     *
+     * @return array{groupID: int, redirectURL: string}
      * @deprecated 6.2 Use `CopyUserGroup` instead.
      */
     public function copy()

wcfsetup/install/files/lib/page/MembersListPage.class.php

@@ -32,6 +32,7 @@ class MembersListPage extends AbstractListViewPage
     public ?int $searchID = null;
 
     /**
+     * @var list<string>
      * @deprecated 6.2 No longer in use, but here for backwards compatibility.
      */
     public $validSortFields = ['username', 'registrationDate', 'activityPoints', 'likesReceived', 'lastActivityTime'];

wcfsetup/install/files/lib/page/TeamPage.class.php

@@ -2,6 +2,7 @@
 
 namespace wcf\page;
 
+use wcf\data\user\group\UserGroup;
 use wcf\data\user\group\UserGroupList;
 use wcf\system\listView\user\TeamListView;
 use wcf\system\page\PageLocationManager;
@@ -26,6 +27,12 @@ class TeamPage extends AbstractPage
      */
     public $neededModules = ['MODULE_TEAM_PAGE'];
 
+    /**
+     * @var list<array{
+     *  team: UserGroup,
+     *  listView: TeamListView,
+     * }>
+     */
     protected array $teams = [];
 
     #[\Override]

wcfsetup/install/files/lib/system/message/quote/AbstractMessageQuoteHandler.class.php

@@ -69,6 +69,7 @@ public function render(array $data, $supportPaste = false)
      *
      * @param mixed[][] $data
      * @param bool $render
+     * @param bool $renderAsString
      * @return  string[]
      * @deprecated 6.2 Implement `getMessage()` instead.
      */

wcfsetup/install/files/lib/system/message/quote/MessageQuoteManager.class.php

@@ -144,8 +144,7 @@ public function removeQuote($quoteID)
      * Returns an array containing the quote author, link and text.
      *
      * @param string $quoteID
-     *
-     * @return  string[]|false
+     * @return array{objectID: int, author: string, avatar: string, link: string, message: string, rawMessage: string}
      * @deprecated 6.2
      */
     public function getQuoteComponents($quoteID)
@@ -245,30 +244,25 @@ public function getQuotesByParentObjectID($objectType, $parentObjectID, $markFor
      *
      * @param string $quoteID
      * @param bool $useFullQuote
-     *
-     * @return  string|null
-     *
+     * @return string
      * @deprecated 6.2
      */
     public function getQuote($quoteID, $useFullQuote = true)
     {
         \assert(isset($this->legacyQuoteData));
+
         if ($useFullQuote && $this->legacyQuoteData['fullQuote'] !== '') {
             return $this->legacyQuoteData['fullQuote'];
-        } else {
-            return $this->legacyQuoteData['message'];
         }
 
-        return null;
+        return $this->legacyQuoteData['message'];
     }
 
     /**
      * Returns the object id by quote id.
      *
      * @param string $quoteID
-     *
-     * @return  int|null
-     *
+     * @return null
      * @deprecated 6.2
      */
     public function getObjectID($quoteID)