From 78dace58e656c11fe5799a23dbafb696ade05e1a Mon Sep 17 00:00:00 2001 From: Umherirrender Date: Sun, 31 May 2020 17:39:12 +0200 Subject: [PATCH] build: Bump phan to 0.10.2, remove taint-check Change-Id: I044a8b6d32dc539911616e88f9491b3b3c382449 --- .phan/config.php | 8 ++++++-- MathLaTeXML.php | 1 + composer.json | 5 +---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.phan/config.php b/.phan/config.php index 0703b721f..4b3ee644b 100644 --- a/.phan/config.php +++ b/.phan/config.php @@ -8,7 +8,9 @@ $cfg['directory_list'] = array_merge( $cfg['directory_list'], [ '../../extensions/VisualEditor', - '../../extensions/Wikibase' + '../../extensions/Wikibase/client', + '../../extensions/Wikibase/repo', + '../../extensions/Wikibase/lib', ] ); @@ -16,7 +18,9 @@ $cfg['exclude_analysis_directory_list'] = array_merge( $cfg['exclude_analysis_directory_list'], [ '../../extensions/VisualEditor', - '../../extensions/Wikibase' + '../../extensions/Wikibase/client', + '../../extensions/Wikibase/repo', + '../../extensions/Wikibase/lib', ] ); diff --git a/MathLaTeXML.php b/MathLaTeXML.php index 9c1772b1a..913fe2103 100644 --- a/MathLaTeXML.php +++ b/MathLaTeXML.php @@ -113,6 +113,7 @@ class MathLaTeXML extends MathMathML { $this->lastError = ''; $requestResult = $this->makeRequest( $host, $post, $res, $this->lastError ); if ( $requestResult ) { + // @phan-suppress-next-line PhanTypeMismatchArgumentInternal $jsonResult = json_decode( $res ); if ( $jsonResult && json_last_error() === JSON_ERROR_NONE ) { if ( $this->isValidMathML( $jsonResult->result ) ) { diff --git a/composer.json b/composer.json index ddbf06c2d..c1c08efcd 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "mediawiki/mediawiki-codesniffer": "31.0.0", - "mediawiki/mediawiki-phan-config": "0.9.1", + "mediawiki/mediawiki-phan-config": "0.10.2", "mediawiki/minus-x": "1.0.0", "php-parallel-lint/php-console-highlighter": "0.4.0", "php-parallel-lint/php-parallel-lint": "1.0.0" @@ -16,8 +16,5 @@ "minus-x fix .", "phpcbf" ] - }, - "extra": { - "phan-taint-check-plugin": "2.0.1" } }