wikimedia/mediawiki-extensions-TemplateData
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/TemplateData synced 2024-11-28 01:30:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Upgrade mediawiki/mediawiki-phan-config from 0.5.0 to 0.6.0

Browse source 
Change-Id: I5d1e3bde15fb951f7dc8ee7d753b090a12661e3c
This commit is contained in:
James D. Forrester 2019-05-19 13:35:02 +02:00
parent 2284a41e61
commit ecab0b8dbb
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

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

14
includes/TemplateDataBlob.php
View file

@ -723,8 +723,7 @@ class TemplateDataBlob {
'mw-templatedata-doc-muted' => $data->description === null, 'mw-templatedata-doc-muted' => $data->description === null,
] ]
], ],
$data->description !== null ? $data->description ??
$data->description :
wfMessage( 'templatedata-doc-desc-empty' )->inLanguage( $lang )->text() wfMessage( 'templatedata-doc-desc-empty' )->inLanguage( $lang )->text()
) )
. '<table class="wikitable mw-templatedata-doc-params sortable">' . '<table class="wikitable mw-templatedata-doc-params sortable">'
@ -820,11 +819,7 @@ class TemplateDataBlob {
$html .= '<tr>' $html .= '<tr>'
// Label // Label
. Html::element( 'th', [], . Html::element( 'th', [], $paramObj->label ?? $lang->ucfirst( $paramName ) )
$paramObj->label !== null ?
$paramObj->label :
$lang->ucfirst( $paramName )
)
// Parameters and aliases // Parameters and aliases
. Html::rawElement( 'td', [ 'class' => 'mw-templatedata-doc-param-name' ], . Html::rawElement( 'td', [ 'class' => 'mw-templatedata-doc-param-name' ],
Html::element( 'code', [], $paramName ) . $aliases Html::element( 'code', [], $paramName ) . $aliases
@ -836,9 +831,8 @@ class TemplateDataBlob {
] ]
], ],
Html::element( 'p', [], Html::element( 'p', [],
$paramObj->description !== null ? $paramObj->description ??
$paramObj->description : wfMessage( 'templatedata-doc-param-desc-empty' )->inLanguage( $lang )->text()
wfMessage( 'templatedata-doc-param-desc-empty' )->inLanguage( $lang )->text()
) )
. Html::rawElement( 'dl', [], . Html::rawElement( 'dl', [],
// Default // Default