registration: Improve duplicate config setting exception

[lhc/web/wiklou.git] / maintenance / deleteEqualMessages.php

diff --git a/maintenance/deleteEqualMessages.php b/maintenance/deleteEqualMessages.php
index f21f3e1..cd9ef11 100644 (file)
--- a/maintenance/deleteEqualMessages.php
+++ b/maintenance/deleteEqualMessages.php
@@ -60,7 +60,7 @@ class DeleteEqualMessages extends Maintenance {
                $l10nCache = Language::getLocalisationCache();
                $messageNames = $l10nCache->getSubitemList( 'en', 'messages' );
                // Normalise message names for NS_MEDIAWIKI page_title
-               $messageNames = array_map( array( $wgContLang, 'ucfirst' ), $messageNames );
+               $messageNames = array_map( [ $wgContLang, 'ucfirst' ], $messageNames );
 
                $statuses = AllMessagesTablePager::getCustomisedStatuses(
                        $messageNames, $langCode, $nonContLang );
@@ -82,10 +82,10 @@ class DeleteEqualMessages extends Maintenance {
                                                $actual === $default
                                ) {
                                        $hasTalk = isset( $statuses['talks'][$key] );
-                                       $messageInfo['results'][] = array(
+                                       $messageInfo['results'][] = [
                                                'title' => $key . $titleSuffix,
                                                'hasTalk' => $hasTalk,
-                                       );
+                                       ];
                                        $messageInfo['equalPages']++;
                                        if ( $hasTalk ) {
                                                $messageInfo['equalPagesTalks']++;
@@ -100,12 +100,12 @@ class DeleteEqualMessages extends Maintenance {
                $doDeleteTalk = $this->hasOption( 'delete-talk' );
                $langCode = $this->getOption( 'lang-code' );
 
-               $messageInfo = array(
+               $messageInfo = [
                        'relevantPages' => 0,
                        'equalPages' => 0,
                        'equalPagesTalks' => 0,
-                       'results' => array(),
-               );
+                       'results' => [],
+               ];
 
                $this->output( 'Checking for pages with default message...' );
 
@@ -123,7 +123,7 @@ class DeleteEqualMessages extends Maintenance {
                                $this->fetchMessageInfo( false, $messageInfo );
                        } else {
                                if ( !isset( $langCodes[$langCode] ) ) {
-                                       $this->error( 'Invalid language code: ' . $langCode, 1 );
+                                       $this->fatalError( 'Invalid language code: ' . $langCode );
                                }
                                $this->fetchMessageInfo( $langCode, $messageInfo );
                        }
@@ -162,9 +162,9 @@ class DeleteEqualMessages extends Maintenance {
                        return;
                }
 
-               $user = User::newSystemUser( 'MediaWiki default', array( 'steal' => true ) );
+               $user = User::newSystemUser( 'MediaWiki default', [ 'steal' => true ] );
                if ( !$user ) {
-                       $this->error( "Invalid username", true );
+                       $this->fatalError( "Invalid username" );
                }
                global $wgUser;
                $wgUser = $user;
@@ -202,5 +202,5 @@ class DeleteEqualMessages extends Maintenance {
        }
 }
 
-$maintClass = "DeleteEqualMessages";
+$maintClass = DeleteEqualMessages::class;
 require_once RUN_MAINTENANCE_IF_MAIN;