X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=maintenance%2FmergeMessageFileList.php;h=51c41db3251415b8f2b813deffa3d07c4799813f;hp=bb4763135724ba8bb2b501371de8ba3da4a16fbd;hb=228d796b1d6299ccd39418e85f40437292b47dd4;hpb=8bb5a6c461c31ee5ce6874548246fc2c520686f6

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index bb47631357..51c41db325 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -26,7 +26,7 @@
 define( 'MW_NO_EXTENSION_MESSAGES', 1 );
 
 require_once __DIR__ . '/Maintenance.php';
-$maintClass = 'MergeMessageFileList';
+$maintClass = MergeMessageFileList::class;
 $mmfl = false;
 
 /**
@@ -52,17 +52,16 @@ class MergeMessageFileList extends Maintenance {
 	}
 
 	public function execute() {
-		// @codingStandardsIgnoreStart Ignore error: Global variable "$mmfl" is lacking 'wg' prefix
+		// phpcs:ignore MediaWiki.NamingConventions.ValidGlobalName.wgPrefix
 		global $mmfl;
-		// @codingStandardsIgnoreEnd
 		global $wgExtensionEntryPointListFiles;
 
 		if ( !count( $wgExtensionEntryPointListFiles )
 			&& !$this->hasOption( 'list-file' )
 			&& !$this->hasOption( 'extensions-dir' )
 		) {
-			$this->error( "Either --list-file or --extensions-dir must be provided if " .
-				"\$wgExtensionEntryPointListFiles is not set", 1 );
+			$this->fatalError( "Either --list-file or --extensions-dir must be provided if " .
+				"\$wgExtensionEntryPointListFiles is not set" );
 		}
 
 		$mmfl = [ 'setupFiles' => [] ];
@@ -80,29 +79,29 @@ class MergeMessageFileList extends Maintenance {
 			$extdirs = explode( ':', $extdir );
 			$entries = [];
 			foreach ( $extdirs as $extdir ) {
-				$entries = array_merge( $entries, scandir( $extdir ) );
-			}
-			foreach ( $entries as $extname ) {
-				if ( $extname == '.' || $extname == '..' || !is_dir( "$extdir/$extname" ) ) {
-					continue;
-				}
-				$possibilities = [
-					"$extdir/$extname/extension.json",
-					"$extdir/$extname/skin.json",
-					"$extdir/$extname/$extname.php"
-				];
-				$found = false;
-				foreach ( $possibilities as $extfile ) {
-					if ( file_exists( $extfile ) ) {
-						$mmfl['setupFiles'][] = $extfile;
-						$found = true;
-						break;
+				$entries = scandir( $extdir );
+				foreach ( $entries as $extname ) {
+					if ( $extname == '.' || $extname == '..' || !is_dir( "$extdir/$extname" ) ) {
+						continue;
+					}
+					$possibilities = [
+						"$extdir/$extname/extension.json",
+						"$extdir/$extname/skin.json",
+						"$extdir/$extname/$extname.php"
+					];
+					$found = false;
+					foreach ( $possibilities as $extfile ) {
+						if ( file_exists( $extfile ) ) {
+							$mmfl['setupFiles'][] = $extfile;
+							$found = true;
+							break;
+						}
 					}
-				}
 
-				if ( !$found ) {
-					$this->error( "Extension {$extname} in {$extdir} lacks expected entry point: " .
-						"extension.json, skin.json, or {$extname}.php." );
+					if ( !$found ) {
+						$this->error( "Extension {$extname} in {$extdir} lacks expected entry point: " .
+							"extension.json, skin.json, or {$extname}.php." );
+					}
 				}
 			}
 		}