diff --git a/composer.json b/composer.json index f802ffe2a..6be82fb45 100644 --- a/composer.json +++ b/composer.json @@ -12,8 +12,8 @@ "jakub-onderka/php-parallel-lint": "1.0.0", "mediawiki/mediawiki-codesniffer": "29.0.0", "jakub-onderka/php-console-highlighter": "0.4.0", - "mediawiki/minus-x": "0.3.2", - "mediawiki/mediawiki-phan-config": "0.9.0" + "mediawiki/minus-x": "1.0.0", + "mediawiki/mediawiki-phan-config": "0.9.1" }, "scripts": { "fix": [ diff --git a/includes/AbuseFilterRunner.php b/includes/AbuseFilterRunner.php index ea4f42043..e7ca42a36 100644 --- a/includes/AbuseFilterRunner.php +++ b/includes/AbuseFilterRunner.php @@ -773,6 +773,7 @@ class AbuseFilterRunner { $this->user->getName(), $maxExpiry, true, + // @phan-suppress-next-line PhanTypeMismatchArgumentNullable $blockValues[2] ); $message = [ @@ -782,6 +783,7 @@ class AbuseFilterRunner { ]; // Manually add the message. If we're here, there is one. $messages[] = $message; + // @phan-suppress-next-line PhanTypeMismatchDimAssignment $actionsTaken[$blockValues[1]][] = 'block'; } diff --git a/includes/Views/AbuseFilterViewEdit.php b/includes/Views/AbuseFilterViewEdit.php index 6c552f2d2..b4a3ec35c 100644 --- a/includes/Views/AbuseFilterViewEdit.php +++ b/includes/Views/AbuseFilterViewEdit.php @@ -468,6 +468,7 @@ class AbuseFilterViewEdit extends AbuseFilterView { $out->addHTML( $form ); if ( $history_id ) { + // @phan-suppress-next-line PhanPossiblyUndeclaredVariable $out->addWikiMsg( $oldWarningMessage, $history_id, $filter ); } } diff --git a/includes/parser/AFPData.php b/includes/parser/AFPData.php index 5a79a4736..105e57584 100644 --- a/includes/parser/AFPData.php +++ b/includes/parser/AFPData.php @@ -181,7 +181,6 @@ class AFPData { * only returns a boolean, and thus the type of the result has already been decided and cannot * be changed to be a DUNDEFINED from here. * @internal - * @suppress PhanSuspiciousValueComparison Lots of false positives for self::DARRAY */ public function equals( AFPData $d2, $strict = false ) { if ( $this->type === self::DUNDEFINED || $d2->type === self::DUNDEFINED ) { diff --git a/includes/parser/AFPTreeParser.php b/includes/parser/AFPTreeParser.php index 0eaceb34d..0d99ddb81 100644 --- a/includes/parser/AFPTreeParser.php +++ b/includes/parser/AFPTreeParser.php @@ -731,6 +731,7 @@ class AFPTreeParser extends AFPTransitionBase { } $this->move(); + // @phan-suppress-next-next-line PhanPossiblyUndeclaredVariable // @phan-suppress-next-line PhanTypeMismatchReturnNullable Until phan can understand the switch return $result; } diff --git a/includes/parser/AbuseFilterParser.php b/includes/parser/AbuseFilterParser.php index 2bb9b2336..684aba40f 100644 --- a/includes/parser/AbuseFilterParser.php +++ b/includes/parser/AbuseFilterParser.php @@ -476,6 +476,7 @@ class AbuseFilterParser extends AFPTransitionBase { * * @param AFPData &$result * @throws AFPUserVisibleException + * @suppress PhanPossiblyUndeclaredVariable */ protected function doLevelConditions( &$result ) { if ( $this->mCur->type === AFPToken::TKEYWORD && $this->mCur->value === 'if' ) {