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

Merge "Use more canonical (object)[] instead of new stdClass"

Browse source
This commit is contained in:
jenkins-bot 2020-09-08 22:45:13 +00:00 committed by Gerrit Code Review
parent 3319103531 62ac9da173
commit 8e56813b6e
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
includes/TemplateDataBlob.php
View file

@ -63,12 +63,13 @@ class TemplateDataBlob {
// If data is invalid, replace with the minimal valid blob.
// This is to make sure that, if something forgets to check the status first,
// we don't end up with invalid data in the database.
$tdb->data = new stdClass();
$tdb->data->description = null;
$tdb->data->params = new stdClass();
$tdb->data->format = null;
$tdb->data->sets = [];
$tdb->data->maps = new stdClass();
$tdb->data = (object)[
'description' => null,
'params' => (object)[],
'format' => null,
'sets' => [],
'maps' => (object)[],
];
}
$tdb->status = $status;
return $tdb;
@ -487,7 +488,7 @@ class TemplateDataBlob {
return Status::newFatal( 'templatedata-invalid-type', 'maps', 'object' );
}
} else {
$data->maps = new stdClass();
$data->maps = (object)[];
}
foreach ( $data->maps as $consumerId => $map ) {
@ -562,9 +563,7 @@ class TemplateDataBlob {
protected static function normaliseInterfaceText( $text ) {
if ( is_string( $text ) ) {
$contLang = MediaWikiServices::getInstance()->getContentLanguage();
$ret = new stdClass();
$ret->{ $contLang->getCode() } = $text;
return $ret;
return (object)[ $contLang->getCode() => $text ];
}
return $text;
}