Merge "Add support for PHP7 random_bytes in favor of mcrypt_create_iv"

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

diff --git a/maintenance/generateJsonI18n.php b/maintenance/generateJsonI18n.php
index b9c07fb..a84f2ae 100644 (file)
--- a/maintenance/generateJsonI18n.php
+++ b/maintenance/generateJsonI18n.php
@@ -35,7 +35,7 @@ require_once __DIR__ . '/Maintenance.php';
 class GenerateJsonI18n extends Maintenance {
        public function __construct() {
                parent::__construct();
-               $this->mDescription = "Build JSON messages files from a PHP messages file";
+               $this->addDescription( 'Build JSON messages files from a PHP messages file' );
 
                $this->addArg( 'phpfile', 'PHP file defining a $messages array', false );
                $this->addArg( 'jsondir', 'Directory to write JSON files to', false );
@@ -108,6 +108,7 @@ class GenerateJsonI18n extends Maintenance {
                if ( !is_readable( $phpfile ) ) {
                        $this->error( "Error reading $phpfile", 1 );
                }
+               $messages = null;
                include $phpfile;
                $phpfileContents = file_get_contents( $phpfile );
 
@@ -131,7 +132,7 @@ class GenerateJsonI18n extends Maintenance {
                        ) );
                        // Make sure the @metadata key is the first key in the output
                        $langmsgs = array_merge(
-                               array( '@metadata' => array( 'authors' => $authors ) ),
+                               [ '@metadata' => [ 'authors' => $authors ] ],
                                $langmsgs
                        );
 
@@ -187,7 +188,7 @@ class GenerateJsonI18n extends Maintenance {
                $matches = null;
                preg_match_all( '/@author (.*?)$/m', $comment, $matches );
 
-               return $matches && $matches[1] ? $matches[1] : array();
+               return $matches && $matches[1] ? $matches[1] : [];
        }
 }