Merge pull request #6242 from WoltLab/62-phpstan-level6

Increase PHPStan to level 6

Author: dtdesign

phpstan-baseline.neon

@@ -84,18 +84,6 @@ parameters:
 			count: 2
 			path: wcfsetup/install/files/lib/data/comment/CommentAction.class.php
 
-		-
-			message: '#^Property wcf\\data\\comment\\response\\CommentResponseAction\:\:\$response \(wcf\\data\\comment\\response\\CommentResponse\) does not accept wcf\\data\\comment\\response\\CommentResponseEditor\.$#'
-			identifier: assign.propertyType
-			count: 1
-			path: wcfsetup/install/files/lib/data/comment/response/CommentResponseAction.class.php
-
-		-
-			message: '#^Property wcf\\data\\style\\StyleAction\:\:\$style \(wcf\\data\\style\\Style\) does not accept wcf\\data\\style\\StyleEditor\.$#'
-			identifier: assign.propertyType
-			count: 1
-			path: wcfsetup/install/files/lib/data/style/StyleAction.class.php
-
 		-
 			message: '#^While loop condition is always true\.$#'
 			identifier: while.alwaysTrue
@@ -108,18 +96,6 @@ parameters:
 			count: 1
 			path: wcfsetup/install/files/lib/form/LostPasswordForm.class.php
 
-		-
-			message: '#^Negated boolean expression is always true\.$#'
-			identifier: booleanNot.alwaysTrue
-			count: 1
-			path: wcfsetup/install/files/lib/page/AbstractPage.class.php
-
-		-
-			message: '#^Strict comparison using \=\=\= between int and ''og\:description'' will always evaluate to false\.$#'
-			identifier: identical.alwaysFalse
-			count: 1
-			path: wcfsetup/install/files/lib/page/AbstractPage.class.php
-
 		-
 			message: '#^Instanceof between wcf\\data\\search\\ISearchResultObject and wcf\\data\\search\\ISearchResultObject will always evaluate to true\.$#'
 			identifier: instanceof.alwaysTrue
@@ -402,12 +378,6 @@ parameters:
 			count: 1
 			path: wcfsetup/install/files/lib/system/condition/AbstractMultiSelectCondition.class.php
 
-		-
-			message: '#^PHPDoc type array of property wcf\\system\\condition\\AbstractMultiSelectCondition\:\:\$fieldValue is not covariant with PHPDoc type string of overridden property wcf\\system\\condition\\AbstractSelectCondition\:\:\$fieldValue\.$#'
-			identifier: property.phpDocType
-			count: 1
-			path: wcfsetup/install/files/lib/system/condition/AbstractMultiSelectCondition.class.php
-
 		-
 			message: '#^Parameter \#2 \$array of function implode expects array\|null, string given\.$#'
 			identifier: argument.type
@@ -780,12 +750,6 @@ parameters:
 			count: 2
 			path: wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygFormContainer.class.php
 
-		-
-			message: '#^Call to function is_array\(\) with array will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 2
-			path: wcfsetup/install/files/lib/system/form/builder/data/FormDataHandler.class.php
-
 		-
 			message: '#^Call to function is_bool\(\) with string will always evaluate to false\.$#'
 			identifier: function.impossibleType
@@ -1017,7 +981,7 @@ parameters:
 		-
 			message: '#^Call to function is_numeric\(\) with float\|int will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
-			count: 7
+			count: 2
 			path: wcfsetup/install/files/lib/system/form/builder/field/UploadFormField.class.php
 
 		-
@@ -1045,7 +1009,7 @@ parameters:
 			path: wcfsetup/install/files/lib/system/form/builder/field/acl/AclFormField.class.php
 
 		-
-			message: '#^Instanceof between wcf\\data\\DatabaseObjectList and wcf\\data\\DatabaseObjectList will always evaluate to true\.$#'
+			message: '#^Instanceof between wcf\\data\\DatabaseObjectList<wcf\\data\\DatabaseObject> and wcf\\data\\DatabaseObjectList will always evaluate to true\.$#'
 			identifier: instanceof.alwaysTrue
 			count: 1
 			path: wcfsetup/install/files/lib/system/form/builder/field/dependency/ValueFormFieldDependency.class.php
@@ -1183,7 +1147,7 @@ parameters:
 			path: wcfsetup/install/files/lib/system/label/object/AbstractLabelObjectHandler.class.php
 
 		-
-			message: '#^Call to an undefined method wcf\\data\\DatabaseObjectList\:\:getAttachmentList\(\)\.$#'
+			message: '#^Call to an undefined method wcf\\data\\DatabaseObjectList<wcf\\data\\DatabaseObject>\:\:getAttachmentList\(\)\.$#'
 			identifier: method.notFound
 			count: 1
 			path: wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
@@ -1293,13 +1257,13 @@ parameters:
 		-
 			message: '#^Call to function assert\(\) with true will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
-			count: 1
+			count: 2
 			path: wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php
 
 		-
 			message: '#^Instanceof between DOMElement and DOMElement will always evaluate to true\.$#'
 			identifier: instanceof.alwaysTrue
-			count: 1
+			count: 2
 			path: wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php
 
 		-
@@ -1311,13 +1275,13 @@ parameters:
 		-
 			message: '#^Call to function assert\(\) with true will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
-			count: 1
+			count: 2
 			path: wcfsetup/install/files/lib/system/package/plugin/UserMenuPackageInstallationPlugin.class.php
 
 		-
 			message: '#^Instanceof between DOMElement and DOMElement will always evaluate to true\.$#'
 			identifier: instanceof.alwaysTrue
-			count: 1
+			count: 2
 			path: wcfsetup/install/files/lib/system/package/plugin/UserMenuPackageInstallationPlugin.class.php
 
 		-

phpstan.neon

@@ -2,7 +2,7 @@ includes:
     - phpstan-baseline.neon
 
 parameters:
-    level: 5
+    level: 6
     paths:
         - wcfsetup/install/files
     excludePaths:
@@ -12,6 +12,7 @@ parameters:
         - constants.php
     ignoreErrors:
         - identifier: match.unhandled
+        - identifier: method.unused
         - identifier: new.static
         - identifier: trait.unused
     universalObjectCratesClasses:

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

@@ -24,6 +24,15 @@
 final class DashboardConfigureAction implements RequestHandlerInterface
 {
     private AcpDashboard $dashboard;
+
+    /**
+     * @var array<string, array{
+     *  boxName: string,
+     *  userID: int,
+     *  enabled: int,
+     *  showOrder: int,
+     * }>
+     */
     private array $userConfiguration;
 
     public function __construct()
@@ -88,6 +97,9 @@ private function getForm(): Psr15DialogForm
         return $form;
     }
 
+    /**
+     * @return list<string>
+     */
     private function getSelectedBoxNames(): array
     {
         $selectedBoxNames = [];
@@ -111,6 +123,9 @@ private function getConfigurationFormField(): MultipleSelectionFormField
         };
     }
 
+    /**
+     * @return array<string, string>
+     */
     private function getBoxOptions(): array
     {
         $options = [];
@@ -123,6 +138,9 @@ private function getBoxOptions(): array
         return $options;
     }
 
+    /**
+     * @param array<string, string> &$options
+     */
     private function sortBoxOptions(array &$options): void
     {
         \uksort($options, function (string $boxNameA, string $boxNameB) {

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

@@ -19,7 +19,7 @@ final class FullLogoutAction extends LogoutAction
     /**
      * @inheritDoc
      */
-    public function execute()
+    public function execute(): RedirectResponse
     {
         AbstractSecureAction::execute();
 

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

@@ -81,6 +81,9 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         }
     }
 
+    /**
+     * @param Tag[] $tags
+     */
     private function getForm(array $tags): Psr15DialogForm
     {
         $form = new Psr15DialogForm(

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

@@ -75,7 +75,7 @@ public function readParameters()
         }
     }
 
-    public function execute()
+    public function execute(): ResponseInterface
     {
         parent::execute();
 

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

@@ -3,6 +3,7 @@
 namespace wcf\acp\action;
 
 use Laminas\Diactoros\Response\JsonResponse;
+use Psr\Http\Message\ResponseInterface;
 use wcf\action\AbstractAction;
 use wcf\data\package\PackageCache;
 use wcf\data\user\cover\photo\DefaultUserCoverPhoto;
@@ -35,7 +36,7 @@ final class UserExportGdprAction extends AbstractAction
     /**
      * export data
      *
-     * @var array
+     * @var mixed[]
      */
     public $data = [];
 
@@ -149,7 +150,7 @@ public function readParameters()
     /**
      * @inheritDoc
      */
-    public function execute()
+    public function execute(): ResponseInterface
     {
         // you MUST NOT use the `execute` event to provide data, use `export` (see below) instead!
         parent::execute();
@@ -249,7 +250,7 @@ public function execute()
      * @param string $ipAddressColumn
      * @param string $timeColumn
      * @param string $userIDColumn
-     * @return      array
+     * @return mixed[]
      */
     public function exportIpAddresses($databaseTable, $ipAddressColumn, $timeColumn, $userIDColumn)
     {
@@ -263,6 +264,11 @@ public function exportIpAddresses($databaseTable, $ipAddressColumn, $timeColumn,
         return $this->fetchIpAddresses($statement, $ipAddressColumn, $timeColumn);
     }
 
+    /**
+     * @param string $tableName
+     * @param string $userIDColumn
+     * @return mixed[]
+     */
     protected function dumpTable($tableName, $userIDColumn)
     {
         $sql = "SELECT  *
@@ -279,6 +285,11 @@ protected function dumpTable($tableName, $userIDColumn)
         return $data;
     }
 
+    /**
+     * @param string $ipAddressColumn
+     * @param string $timeColumn
+     * @return array{ipAddress: string, time: mixed}[]
+     */
     protected function fetchIpAddresses(PreparedStatement $statement, $ipAddressColumn, $timeColumn)
     {
         $ipAddresses = [];
@@ -297,6 +308,9 @@ protected function fetchIpAddresses(PreparedStatement $statement, $ipAddressColu
         return $ipAddresses;
     }
 
+    /**
+     * @return array{session: mixed[], acpSessionLog: mixed[]}
+     */
     protected function exportSessionIpAddresses()
     {
         $data = [
@@ -323,6 +337,9 @@ protected function exportSessionIpAddresses()
         return $data;
     }
 
+    /**
+     * @return array<string, mixed>
+     */
     protected function exportUser()
     {
         $data = ['languageCode' => $this->user->getLanguage()->getFixedLanguageCode()];
@@ -351,6 +368,9 @@ protected function exportUser()
         return $data;
     }
 
+    /**
+     * @return mixed[]
+     */
     protected function exportUserOptions()
     {
         $optionHandler = new UserOptionHandler(false, '', '');
@@ -365,6 +385,11 @@ protected function exportUserOptions()
         return $data;
     }
 
+    /**
+     * @param mixed[] &$data
+     * @param mixed[] $optionTree
+     * @return void
+     */
     protected function exportUserOptionCategory(array &$data, array $optionTree)
     {
         if (!empty($optionTree['options'])) {

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

@@ -83,7 +83,7 @@ public function readParameters()
     /**
      * @inheritDoc
      */
-    public function execute()
+    public function execute(): RedirectResponse
     {
         ACPMenu::getInstance()->setActiveMenuItem('wcf.acp.menu.link.user.search');
 

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

@@ -32,7 +32,7 @@ final class WorkerProxyAction extends AJAXInvokeAction
 
     /**
      * parameters for worker action
-     * @var array
+     * @var array<string, mixed>
      */
     protected $parameters = [];
 
@@ -42,6 +42,9 @@ final class WorkerProxyAction extends AJAXInvokeAction
      */
     protected $worker;
 
+    /**
+     * @var string[]
+     */
     public static $allowInvoke = [];
 
     /**
@@ -66,6 +69,8 @@ public function readParameters()
 
     /**
      * Validates class name.
+     *
+     * @return void
      */
     protected function validate()
     {
@@ -112,8 +117,9 @@ public function execute()
      * Sends a JSON-encoded response.
      *
      * @param int $progress
-     * @param array $parameters
+     * @param ?array<string, mixed> $parameters
      * @param string $proceedURL
+     * @return void
      */
     protected function sendResponse($progress = 0, ?array $parameters = null, $proceedURL = '')
     {