X-Git-Url: http://git.cyclocoop.org//%27http:/jquery.khurshid.com/ifixpng.php/%27?a=blobdiff_plain;f=maintenance%2FmergeMessageFileList.php;h=d78c5a0e4d577dc6beefbeafaf791406c7442fac;hb=b2e1af572ede54a0087fe0f8b5a607d475e43b57;hp=51c41db3251415b8f2b813deffa3d07c4799813f;hpb=9a6b2a4fffb82840d0bf780eb4ecb873ad64fa54;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index 51c41db325..d78c5a0e4d 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -77,7 +77,6 @@ class MergeMessageFileList extends Maintenance {
 			$extdir = $this->getOption( 'extensions-dir' );
 			# Allow multiple directories to be passed with ":" as delimiter
 			$extdirs = explode( ':', $extdir );
-			$entries = [];
 			foreach ( $extdirs as $extdir ) {
 				$entries = scandir( $extdir );
 				foreach ( $entries as $extname ) {
@@ -130,7 +129,6 @@ class MergeMessageFileList extends Maintenance {
 		$files = [];
 		$fileLines = file( $fileName );
 		if ( $fileLines === false ) {
-			$this->hasError = true;
 			$this->error( "Unable to open list file $fileName." );
 
 			return $files;
@@ -145,7 +143,6 @@ class MergeMessageFileList extends Maintenance {
 				if ( file_exists( $extension ) ) {
 					$files[] = $extension;
 				} else {
-					$this->hasError = true;
 					$this->error( "Extension {$extension} doesn't exist" );
 				}
 			}
@@ -158,6 +155,7 @@ class MergeMessageFileList extends Maintenance {
 require_once RUN_MAINTENANCE_IF_MAIN;
 
 $queue = [];
+'@phan-var string[][] $mmfl';
 foreach ( $mmfl['setupFiles'] as $fileName ) {
 	if ( strval( $fileName ) === '' ) {
 		continue;
@@ -185,7 +183,7 @@ if ( $queue ) {
 
 fwrite( STDERR, "\n" );
 $s =
-	"<" . "?php\n" .
+	"<?php\n" .
 	"## This file is generated by mergeMessageFileList.php. Do not edit it directly.\n\n" .
 	"if ( defined( 'MW_NO_EXTENSION_MESSAGES' ) ) return;\n\n" .
 	'$wgExtensionMessagesFiles = ' . var_export( $wgExtensionMessagesFiles, true ) . ";\n\n" .