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

Merge "Use more specific instanceof stdClass instead of is_object()"

Browse source
This commit is contained in:
jenkins-bot 2022-02-02 12:31:35 +00:00 committed by Gerrit Code Review
parent deeea30725 dc82db422b
commit bd531c2a68
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
includes/TemplateDataHtmlFormatter.php
View file

@ -28,6 +28,7 @@ class TemplateDataHtmlFormatter {
// The following icon names are used here:
// * template-format-block
// * template-format-inline
// @phan-suppress-next-line PhanTypeSuspiciousStringExpression
$icon = 'template-format-' . $data->format;
$formatMsg = $data->format;
} else {

13
includes/TemplateDataValidator.php
View file

@ -70,7 +70,7 @@ class TemplateDataValidator {
return Status::newFatal( 'templatedata-invalid-parse' );
}
if ( !is_object( $data ) ) {
if ( !( $data instanceof stdClass ) ) {
return Status::newFatal( 'templatedata-invalid-type', 'templatedata', 'object' );
}
@ -93,6 +93,7 @@ class TemplateDataValidator {
// Root.format
if ( isset( $data->format ) ) {
// @phan-suppress-next-line PhanTypeMismatchDimFetchNullable
$f = self::PREDEFINED_FORMATS[$data->format] ?? $data->format;
if ( !is_string( $f ) ||
!preg_match( '/^\n?\{\{ *_+\n? *\|\n? *_+ *= *_+\n? *\}\}\n?$/', $f )
@ -108,7 +109,7 @@ class TemplateDataValidator {
return Status::newFatal( 'templatedata-invalid-missing', 'params', 'object' );
}
if ( !is_object( $data->params ) ) {
if ( !( $data->params instanceof stdClass ) ) {
return Status::newFatal( 'templatedata-invalid-type', 'params', 'object' );
}
@ -118,7 +119,7 @@ class TemplateDataValidator {
$unnormalizedParams = unserialize( serialize( $data->params ) );
foreach ( $data->params as $paramName => $param ) {
if ( !is_object( $param ) ) {
if ( !( $param instanceof stdClass ) ) {
return Status::newFatal( 'templatedata-invalid-type', "params.{$paramName}",
'object' );
}
@ -329,7 +330,7 @@ class TemplateDataValidator {
}
foreach ( $data->sets as $setNr => $setObj ) {
if ( !is_object( $setObj ) ) {
if ( !( $setObj instanceof stdClass ) ) {
return Status::newFatal( 'templatedata-invalid-value', "sets.{$setNr}" );
}
@ -370,7 +371,7 @@ class TemplateDataValidator {
// Root.maps
if ( isset( $data->maps ) ) {
if ( !is_object( $data->maps ) ) {
if ( !( $data->maps instanceof stdClass ) ) {
return Status::newFatal( 'templatedata-invalid-type', 'maps', 'object' );
}
} else {
@ -378,7 +379,7 @@ class TemplateDataValidator {
}
foreach ( $data->maps as $consumerId => $map ) {
if ( !is_object( $map ) ) {
if ( !( $map instanceof stdClass ) ) {
return Status::newFatal( 'templatedata-invalid-type', "maps.$consumerId",
'object' );
}