X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=maintenance%2FgenerateJsonI18n.php;h=efddfb3435fac81a95aef54144236eea95ed915f;hp=d3041d9e8f50a0de489f231c9fd863f4cd5768c4;hb=74426f3cf796b149f1ae445e41815bbe148640b2;hpb=fc1ca75323b5f424a9f8d28d42d85a311ed2f721

diff --git a/maintenance/generateJsonI18n.php b/maintenance/generateJsonI18n.php
index d3041d9e8f..efddfb3435 100644
--- a/maintenance/generateJsonI18n.php
+++ b/maintenance/generateJsonI18n.php
@@ -55,7 +55,7 @@ class GenerateJsonI18n extends Maintenance {
 
 		if ( $extension ) {
 			if ( $phpfile ) {
-				$this->error( "The phpfile is already specified, conflicts with --extension.", 1 );
+				$this->fatalError( "The phpfile is already specified, conflicts with --extension." );
 			}
 			$phpfile = "$IP/extensions/$extension/$extension.i18n.php";
 		}
@@ -101,27 +101,28 @@ class GenerateJsonI18n extends Maintenance {
 			$this->output( "Creating directory $jsondir.\n" );
 			$success = mkdir( $jsondir );
 			if ( !$success ) {
-				$this->error( "Could not create directory $jsondir", 1 );
+				$this->fatalError( "Could not create directory $jsondir" );
 			}
 		}
 
 		if ( !is_readable( $phpfile ) ) {
-			$this->error( "Error reading $phpfile", 1 );
+			$this->fatalError( "Error reading $phpfile" );
 		}
+		$messages = null;
 		include $phpfile;
 		$phpfileContents = file_get_contents( $phpfile );
 
 		if ( !isset( $messages ) ) {
-			$this->error( "PHP file $phpfile does not define \$messages array", 1 );
+			$this->fatalError( "PHP file $phpfile does not define \$messages array" );
 		}
 
 		if ( !$messages ) {
-			$this->error( "PHP file $phpfile contains an empty \$messages array. " .
-				"Maybe it was already converted?", 1 );
+			$this->fatalError( "PHP file $phpfile contains an empty \$messages array. " .
+				"Maybe it was already converted?" );
 		}
 
 		if ( !isset( $messages['en'] ) || !is_array( $messages['en'] ) ) {
-			$this->error( "PHP file $phpfile does not set language codes", 1 );
+			$this->fatalError( "PHP file $phpfile does not set language codes" );
 		}
 
 		foreach ( $messages as $langcode => $langmsgs ) {
@@ -141,7 +142,7 @@ class GenerateJsonI18n extends Maintenance {
 				FormatJson::encode( $langmsgs, "\t", FormatJson::ALL_OK ) . "\n"
 			);
 			if ( $success === false ) {
-				$this->error( "FAILED to write $jsonfile", 1 );
+				$this->fatalError( "FAILED to write $jsonfile" );
 			}
 			$this->output( "$jsonfile\n" );
 		}
@@ -191,5 +192,5 @@ class GenerateJsonI18n extends Maintenance {
 	}
 }
 
-$maintClass = "GenerateJsonI18n";
+$maintClass = GenerateJsonI18n::class;
 require_once RUN_MAINTENANCE_IF_MAIN;