X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FuserOptions.php;h=2f8941f3daac14f171130be2c24e1453c2c39735;hb=e65f8ac5110804067366f9f239c13f4f29b66c3d;hp=7cf16b611e59b1bd5495232182794cb64231f26f;hpb=1b13888ed6bd09731f10045650714a3392bb55df;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/userOptions.php b/maintenance/userOptions.php index 7cf16b611e..2f8941f3da 100644 --- a/maintenance/userOptions.php +++ b/maintenance/userOptions.php @@ -102,23 +102,18 @@ The new option is NOT validated.' ); // Get the options and update stats if ( $option ) { if ( !array_key_exists( $option, $defaultOptions ) ) { - $this->error( "Invalid user option. Use --list to see valid choices\n", 1 ); + $this->fatalError( "Invalid user option. Use --list to see valid choices\n" ); } $userValue = $user->getOption( $option ); if ( $userValue <> $defaultOptions[$option] ) { - // @codingStandardsIgnoreStart Ignore silencing errors is discouraged warning - @$ret[$option][$userValue]++; - // @codingStandardsIgnoreEnd + $ret[$option][$userValue] = ( $ret[$option][$userValue] ?? 0 ) + 1; } } else { - foreach ( $defaultOptions as $name => $defaultValue ) { $userValue = $user->getOption( $name ); if ( $userValue != $defaultValue ) { - // @codingStandardsIgnoreStart Ignore silencing errors is discouraged warning - @$ret[$name][$userValue]++; - // @codingStandardsIgnoreEnd + $ret[$name][$userValue] = ( $ret[$name][$userValue] ?? 0 ) + 1; } } } @@ -201,5 +196,5 @@ WARN } } -$maintClass = 'UserOptionsMaintenance'; +$maintClass = UserOptionsMaintenance::class; require RUN_MAINTENANCE_IF_MAIN;