Merge "Http::getProxy() method to get proxy configuration"

[lhc/web/wiklou.git] / includes / api / ApiQueryAllMessages.php

diff --git a/includes/api/ApiQueryAllMessages.php b/includes/api/ApiQueryAllMessages.php
index cc884ec..f1d787b 100644 (file)
--- a/includes/api/ApiQueryAllMessages.php
+++ b/includes/api/ApiQueryAllMessages.php
@@ -50,7 +50,7 @@ class ApiQueryAllMessages extends ApiQueryBase {
                        if ( !is_null( $params['title'] ) ) {
                                $title = Title::newFromText( $params['title'] );
                                if ( !$title || $title->isExternal() ) {
-                                       $this->dieUsageMsg( array( 'invalidtitle', $params['title'] ) );
+                                       $this->dieUsageMsg( [ 'invalidtitle', $params['title'] ] );
                                }
                        } else {
                                $title = Title::newFromText( 'API' );
@@ -82,7 +82,7 @@ class ApiQueryAllMessages extends ApiQueryBase {
                // Because we sorted the message array earlier, they will appear in a clump:
                if ( isset( $params['prefix'] ) ) {
                        $skip = false;
-                       $messages_filtered = array();
+                       $messages_filtered = [];
                        foreach ( $messages_target as $message ) {
                                // === 0: must be at beginning of string (position 0)
                                if ( strpos( $message, $params['prefix'] ) === 0 ) {
@@ -99,7 +99,7 @@ class ApiQueryAllMessages extends ApiQueryBase {
 
                // Filter messages that contain specified string
                if ( isset( $params['filter'] ) ) {
-                       $messages_filtered = array();
+                       $messages_filtered = [];
                        foreach ( $messages_target as $message ) {
                                // !== is used because filter can be at the beginning of the string
                                if ( strpos( $message, $params['filter'] ) !== false ) {
@@ -116,7 +116,13 @@ class ApiQueryAllMessages extends ApiQueryBase {
                        $lang = $langObj->getCode();
 
                        $customisedMessages = AllMessagesTablePager::getCustomisedStatuses(
-                               array_map( array( $langObj, 'ucfirst' ), $messages_target ), $lang, $lang != $wgContLang->getCode() );
+                               array_map(
+                                       [ $langObj, 'ucfirst' ],
+                                       $messages_target
+                               ),
+                               $lang,
+                               $lang != $wgContLang->getCode()
+                       );
 
                        $customised = $params['customised'] === 'modified';
                }
@@ -136,8 +142,12 @@ class ApiQueryAllMessages extends ApiQueryBase {
                        }
 
                        if ( !$skip ) {
-                               $a = array( 'name' => $message );
-                               $args = array();
+                               $a = [
+                                       'name' => $message,
+                                       'normalizedname' => MessageCache::normalizeKey( $message ),
+                               ];
+
+                               $args = [];
                                if ( isset( $params['args'] ) && count( $params['args'] ) != 0 ) {
                                        $args = $params['args'];
                                }
@@ -176,14 +186,14 @@ class ApiQueryAllMessages extends ApiQueryBase {
                                                }
                                        }
                                }
-                               $fit = $result->addValue( array( 'query', $this->getModuleName() ), null, $a );
+                               $fit = $result->addValue( [ 'query', $this->getModuleName() ], null, $a );
                                if ( !$fit ) {
                                        $this->setContinueEnumParameter( 'from', $message );
                                        break;
                                }
                        }
                }
-               $result->addIndexedTagName( array( 'query', $this->getModuleName() ), 'message' );
+               $result->addIndexedTagName( [ 'query', $this->getModuleName() ], 'message' );
        }
 
        public function getCacheMode( $params ) {
@@ -200,48 +210,48 @@ class ApiQueryAllMessages extends ApiQueryBase {
        }
 
        public function getAllowedParams() {
-               return array(
-                       'messages' => array(
+               return [
+                       'messages' => [
                                ApiBase::PARAM_DFLT => '*',
                                ApiBase::PARAM_ISMULTI => true,
-                       ),
-                       'prop' => array(
+                       ],
+                       'prop' => [
                                ApiBase::PARAM_ISMULTI => true,
-                               ApiBase::PARAM_TYPE => array(
+                               ApiBase::PARAM_TYPE => [
                                        'default'
-                               )
-                       ),
+                               ]
+                       ],
                        'enableparser' => false,
                        'nocontent' => false,
                        'includelocal' => false,
-                       'args' => array(
+                       'args' => [
                                ApiBase::PARAM_ISMULTI => true,
                                ApiBase::PARAM_ALLOW_DUPLICATES => true,
-                       ),
-                       'filter' => array(),
-                       'customised' => array(
+                       ],
+                       'filter' => [],
+                       'customised' => [
                                ApiBase::PARAM_DFLT => 'all',
-                               ApiBase::PARAM_TYPE => array(
+                               ApiBase::PARAM_TYPE => [
                                        'all',
                                        'modified',
                                        'unmodified'
-                               )
-                       ),
+                               ]
+                       ],
                        'lang' => null,
                        'from' => null,
                        'to' => null,
                        'title' => null,
                        'prefix' => null,
-               );
+               ];
        }
 
        protected function getExamplesMessages() {
-               return array(
+               return [
                        'action=query&meta=allmessages&amprefix=ipb-'
                                => 'apihelp-query+allmessages-example-ipb',
                        'action=query&meta=allmessages&ammessages=august|mainpage&amlang=de'
                                => 'apihelp-query+allmessages-example-de',
-               );
+               ];
        }
 
        public function getHelpUrls() {