Don't reinvent the wheel to do parameter existence checking

Stops running the code outside the class when there's no point attempting it

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index 8cfefcb..5ef31ca 100644 (file)
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -32,7 +32,7 @@ class MergeMessageFileList extends Maintenance {
 
        function __construct() {
                parent::__construct();
-               $this->addOption( 'list-file', 'A file containing a list of extension setup files, one per line.', false, true );
+               $this->addOption( 'list-file', 'A file containing a list of extension setup files, one per line.', true, true );
                $this->addOption( 'output', 'Send output to this file (omit for stdout)', false, true );
                $this->mDescription = 'Merge $wgExtensionMessagesFiles from various extensions to produce a ' .
                        'single array containing all message files.';
@@ -40,10 +40,6 @@ class MergeMessageFileList extends Maintenance {
 
        public function execute() {
                global $mmfl;
-               if ( !$this->hasOption( 'list-file' ) ) {
-                       $this->error( 'The --list-file option must be specified.' );
-                       return;
-               }
 
                $lines = file( $this->getOption( 'list-file' ) );
                if ( $lines === false ) {