wikimedia/mediawiki-extensions-CategoryTree
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/CategoryTree synced 2024-11-27 17:51:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify ApiCategoryTree::extractOptions

Browse source 
Change-Id: I98605b2580a995e37a8da1b88693b38bbd5b8013
This commit is contained in:
Umherirrender 2023-04-25 20:06:08 +02:00
parent 9be6563cfa
commit 3252ddc115
1 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
includes/ApiCategoryTree.php
View file

@ -98,29 +98,17 @@ class ApiCategoryTree extends ApiBase {
$this->dieWithError( 'apierror-categorytree-invalidjson', 'invalidjson' ); $this->dieWithError( 'apierror-categorytree-invalidjson', 'invalidjson' );
} }
$namespaces = $options->namespaces ?? null;
if ( $namespaces !== null ) {
if ( !is_scalar( $namespaces ) && !is_array( $namespaces ) ) {
$this->dieWithError(
[ 'apierror-categorytree-invalidjson-option', 'namespaces' ], 'invalidjson-option'
);
}
// Don't recheck this in the loop below
unset( $options->namespaces );
}
foreach ( $options as $option => $value ) { foreach ( $options as $option => $value ) {
if ( !is_scalar( $value ) && $value !== null ) { if ( is_scalar( $value ) || $value === null ) {
continue;
}
if ( $option === 'namespaces' && is_array( $value ) ) {
continue;
}
$this->dieWithError( $this->dieWithError(
[ 'apierror-categorytree-invalidjson-option', $option ], 'invalidjson-option' [ 'apierror-categorytree-invalidjson-option', $option ], 'invalidjson-option'
); );
} }
}
if ( $namespaces ) {
$options->namespaces = $namespaces;
}
return get_object_vars( $options ); return get_object_vars( $options );
} }