Merge "build: Bump phan to 0.10.2, remove taint-check"

This commit is contained in:
jenkins-bot 2020-06-01 21:09:22 +00:00 committed by Gerrit Code Review
commit 3157a430f5
3 changed files with 8 additions and 6 deletions

View file

@ -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',
]
);

View file

@ -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 ) ) {

View file

@ -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.5.0",
"php-parallel-lint/php-parallel-lint": "1.2.0"
@ -16,8 +16,5 @@
"minus-x fix .",
"phpcbf"
]
},
"extra": {
"phan-taint-check-plugin": "2.0.1"
}
}