[MediaWiki-commits] [Gerrit] Remove usage of deprecated message methods from describe fun... - change (mediawiki...Validator)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/62970


Change subject: Remove usage of deprecated message methods from describe 
function
......................................................................

Remove usage of deprecated message methods from describe function

Change-Id: Ice2c14cbd74f3f3af523398ddcde898c7b0c0b5b
---
M includes/utils/Describe.php
M includes/utils/ParserHook.php
2 files changed, 14 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Validator 
refs/changes/70/62970/1

diff --git a/includes/utils/Describe.php b/includes/utils/Describe.php
index fd8c290..973141b 100644
--- a/includes/utils/Describe.php
+++ b/includes/utils/Describe.php
@@ -61,6 +61,7 @@
                        'default' => array_keys( 
ParserHook::getRegisteredParserHooks() ),
                        'message' => 'validator-describe-par-hooks',
                        'aliases' => 'hook',
+                       'islist' => true,
                );
 
                $params['pre'] = array(
@@ -111,7 +112,7 @@
                        $parserHook = $this->getParserHookInstance( $hookName );
 
                        if ( $parserHook === false ) {
-                               $parts[] = wfMsgExt( 
'validator-describe-notfound', 'parsemag', $hookName );
+                               $parts[] = wfMessage( 
'validator-describe-notfound', $hookName )->parse();
                        }
                        else {
                                $parts[] = $this->getParserHookDescription( 
$hookName, $parameters, $parserHook );
@@ -154,7 +155,7 @@
                        $description .= "\n\n";
                }
                elseif ( $descriptionData['description'] !== false ) {
-                       $description .= wfMsgExt( 
'validator-describe-descriptionmsg', $descriptionData['description'] );
+                       $description .= wfMessage( 
'validator-describe-descriptionmsg', $descriptionData['description'] )->plain();
                        $description .= "\n\n";
                }
 
@@ -203,8 +204,8 @@
         *
         * @since 0.4.3
         *
-        * @param array of Parameter $parameters
-        * @param array of string $defaults
+        * @param Parameter[] $parameters
+        * @param string[] $defaults
         */
        protected function sortParameters( array &$parameters, array $defaults 
) {
                $sort = array();
@@ -242,7 +243,7 @@
        protected function getSyntaxExamples( $hookName, array $parameters, 
ParserHook $parserHook, array $defaults, $pre ) {
                $result = "\n\n" .
                        ( $pre ? '=== ' : '<h3>' ) .
-                       wfMsg( 'validator-describe-syntax' ) .
+                       wfMessage( 'validator-describe-syntax' )->plain() .
                        ( $pre ? ' ===' : '</h3>' );
 
                $params = array();
@@ -250,11 +251,13 @@
                $plainParams = array();
 
                foreach ( $parameters as $parameter ) {
-                       $params[$parameter->getName()] = '{' . 
$parameter->getTypeMessage() . '}';
-                       $plainParams[$parameter->getName()] = 
$parameter->getTypeMessage();
+                       $type = wfMessage( $parameter->getTypeMessage() 
)->plain();
+
+                       $params[$parameter->getName()] = '{' . $type . '}';
+                       $plainParams[$parameter->getName()] = $type;
 
                        if ( $parameter->isRequired() ) {
-                               $requiredParams[$parameter->getName()] = '{' . 
$parameter->getTypeMessage() . '}';
+                               $requiredParams[$parameter->getName()] = '{' . 
$type . '}';
                        }
                }
 
@@ -418,6 +421,7 @@
                }
 
                $type = $parameter->getTypeMessage();
+               $type = wfMessage( $type )->plain();
 
                $number = 0;
                $isDefault = false;
@@ -490,7 +494,6 @@
         */
        protected function msg() {
                $args = func_get_args();
-               $key = array_shift( $args );
-               return wfMsgReal( $key, $args, true, $this->language );
+               return call_user_func_array( 'wfMessage', $args )->inLanguage( 
$this->language )->plain();
        }
 }
diff --git a/includes/utils/ParserHook.php b/includes/utils/ParserHook.php
index 1ebcdfa..6582907 100644
--- a/includes/utils/ParserHook.php
+++ b/includes/utils/ParserHook.php
@@ -503,7 +503,7 @@
         */
        public function getDescription() {
                $msg = $this->getMessage();
-               return $msg === false ? false : wfMsg( $msg );
+               return $msg === false ? false : wfMessage( $msg )->plain();
        }
        
        /**

-- 
To view, visit https://gerrit.wikimedia.org/r/62970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice2c14cbd74f3f3af523398ddcde898c7b0c0b5b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Validator
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits