From 3a878b81bed6b3799b860cb81d8f70d1d4e35c80 Mon Sep 17 00:00:00 2001
From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Mon, 9 Mar 2015 12:14:20 -0400
Subject: [PATCH] Allow constructing a Message from a MessageSpecifier

Bug: T91986
Change-Id: Id6a9862d23c2b71da2c8b34acdd19b8247ac5301
---
 includes/GlobalFunctions.php           |  2 +-
 includes/Message.php                   | 17 ++++++++++++++---
 tests/phpunit/includes/MessageTest.php | 11 +++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 3be43b39cc..6ebd464db5 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1411,7 +1411,7 @@ function wfGetLangObj( $langcode = false ) {
  *
  * This function replaces all old wfMsg* functions.
  *
- * @param string|string[] $key Message key, or array of keys
+ * @param string|string[]|MessageSpecifier $key Message key, or array of keys, or a MessageSpecifier
  * @param mixed $params,... Normal message parameters
  * @return Message
  *
diff --git a/includes/Message.php b/includes/Message.php
index 134af0ed45..33406561a3 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -226,8 +226,9 @@ class Message implements MessageSpecifier {
 	/**
 	 * @since 1.17
 	 *
-	 * @param string|string[] $key Message key or array of message keys to try and use the first
-	 * non-empty message for.
+	 * @param string|string[]|MessageSpecifier $key Message key, or array of
+	 * message keys to try and use the first non-empty message for, or a
+	 * MessageSpecifier to copy from.
 	 * @param array $params Message parameters.
 	 * @param Language $language Optional language of the message, defaults to $wgLang.
 	 *
@@ -236,6 +237,16 @@ class Message implements MessageSpecifier {
 	public function __construct( $key, $params = array(), Language $language = null ) {
 		global $wgLang;
 
+		if ( $key instanceof MessageSpecifier ) {
+			if ( $params ) {
+				throw new InvalidArgumentException(
+					'$params must be empty if $key is a MessageSpecifier'
+				);
+			}
+			$params = $key->getParams();
+			$key = $key->getKey();
+		}
+
 		if ( !is_string( $key ) && !is_array( $key ) ) {
 			throw new InvalidArgumentException( '$key must be a string or an array' );
 		}
@@ -327,7 +338,7 @@ class Message implements MessageSpecifier {
 	 *
 	 * @since 1.17
 	 *
-	 * @param string|string[] $key Message key or array of keys.
+	 * @param string|string[]|MessageSpecifier $key
 	 * @param mixed $param,... Parameters as strings.
 	 *
 	 * @return Message
diff --git a/tests/phpunit/includes/MessageTest.php b/tests/phpunit/includes/MessageTest.php
index 99ec2e4255..225cc4cd43 100644
--- a/tests/phpunit/includes/MessageTest.php
+++ b/tests/phpunit/includes/MessageTest.php
@@ -21,6 +21,17 @@ class MessageTest extends MediaWikiLangTestCase {
 		$this->assertEquals( $key, $message->getKey() );
 		$this->assertEquals( $params, $message->getParams() );
 		$this->assertEquals( $expectedLang, $message->getLanguage() );
+
+		$messageSpecifier = $this->getMockForAbstractClass( 'MessageSpecifier' );
+		$messageSpecifier->expects( $this->any() )
+			->method( 'getKey' )->will( $this->returnValue( $key ) );
+		$messageSpecifier->expects( $this->any() )
+			->method( 'getParams' )->will( $this->returnValue( $params ) );
+		$message = new Message( $messageSpecifier, array(), $language );
+
+		$this->assertEquals( $key, $message->getKey() );
+		$this->assertEquals( $params, $message->getParams() );
+		$this->assertEquals( $expectedLang, $message->getLanguage() );
 	}
 
 	public static function provideConstructor() {
-- 
2.20.1