wikimedia/mediawiki-extensions-TemplateData
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/TemplateData synced 2024-12-03 20:06:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "build: Updating mediawiki/mediawiki-phan-config to 0.9.0"

Browse source
This commit is contained in:
jenkins-bot 2019-12-29 13:59:32 +00:00 committed by Gerrit Code Review
parent 08c388a3a9 1c8f1b14e8
commit f60b457884
2 changed files with 3 additions and 1 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": "28.0.0", "mediawiki/mediawiki-codesniffer": "28.0.0",
"jakub-onderka/php-console-highlighter": "0.3.2", "jakub-onderka/php-console-highlighter": "0.3.2",
"mediawiki/minus-x": "0.3.2", "mediawiki/minus-x": "0.3.2",
"mediawiki/mediawiki-phan-config": "0.8.0" "mediawiki/mediawiki-phan-config": "0.9.0"
}, },
"scripts": { "scripts": {
"test": [ "test": [

2
includes/TemplateDataBlob.php
View file

@ -164,6 +164,7 @@ class TemplateDataBlob {
if ( !is_object( $data->description ) && !is_string( $data->description ) ) { if ( !is_object( $data->description ) && !is_string( $data->description ) ) {
return Status::newFatal( 'templatedata-invalid-type', 'description', 'string|object' ); return Status::newFatal( 'templatedata-invalid-type', 'description', 'string|object' );
} }
// @phan-suppress-next-line PhanTypeMismatchArgument isset makes this non-null
$data->description = self::normaliseInterfaceText( $data->description ); $data->description = self::normaliseInterfaceText( $data->description );
} else { } else {
$data->description = null; $data->description = null;
@ -171,6 +172,7 @@ class TemplateDataBlob {
// Root.format // Root.format
if ( isset( $data->format ) && $data->format !== null ) { if ( isset( $data->format ) && $data->format !== null ) {
// @phan-suppress-next-line PhanTypeMismatchDimFetchNullable isset makes this non-null
$f = self::$formats[$data->format] ?? $data->format; $f = self::$formats[$data->format] ?? $data->format;
if ( if (
!is_string( $f ) || !is_string( $f ) ||