Merge "Upgrade to newer phan"

This commit is contained in:
jenkins-bot 2019-03-18 01:07:21 +00:00 committed by Gerrit Code Review
commit a6908da6a6
4 changed files with 3 additions and 4 deletions

1
.gitignore vendored
View file

@ -1,6 +1,5 @@
/node_modules/
/vendor/
/tests/phan/issues
/composer.lock
# Editors

View file

@ -1,6 +1,6 @@
<?php
$cfg = require __DIR__ . '/../../vendor/mediawiki/mediawiki-phan-config/src/config.php';
$cfg = require __DIR__ . '/../vendor/mediawiki/mediawiki-phan-config/src/config.php';
// Due to creation of Parser::$extCite property
$cfg['suppress_issue_types'][] = 'PhanUndeclaredProperty';

View file

@ -4,7 +4,7 @@
"mediawiki/mediawiki-codesniffer": "24.0.0",
"jakub-onderka/php-console-highlighter": "0.3.2",
"mediawiki/minus-x": "0.3.1",
"mediawiki/mediawiki-phan-config": "0.3.0"
"mediawiki/mediawiki-phan-config": "0.5.0"
},
"scripts": {
"test": [

View file

@ -840,7 +840,7 @@ class Cite {
// this handles the case of section preview for list-defined references
return wfMessage( 'cite_references_link_many',
$this->normalizeKey(
self::getReferencesKey( $key . "-" . ( isset( $val['key'] ) ? $val['key'] : '' ) )
self::getReferencesKey( $key . "-" . ( $val['key'] ?? '' ) )
),
'',
$text