From 8a7fb8577fd181b0cbe292cdb7435b0f3ae5994f Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 17 Mar 2017 17:22:34 -0700
Subject: [PATCH] resourceloader: Fix broken 'deprecated' string messages

Some used a string value, others an array with 'message' property.
Standardise on the string value, which seems more intuitive.

Change-Id: I5caead7b7017d2bad660db02fb45a54a26bf3728
---
 includes/resourceloader/ResourceLoaderModule.php     |  4 ++--
 resources/Resources.php                              | 12 +++---------
 .../resourceloader/ResourceLoaderFileModuleTest.php  |  4 +---
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php
index a2b4b1d67f..5b862e4a21 100644
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -147,8 +147,8 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface {
 		if ( $deprecationInfo ) {
 			$name = $this->getName();
 			$warning = 'This page is using the deprecated ResourceLoader module "' . $name . '".';
-			if ( !is_bool( $deprecationInfo ) && isset( $deprecationInfo['message'] ) ) {
-				$warning .= "\n" . $deprecationInfo['message'];
+			if ( is_string( $deprecationInfo ) ) {
+				$warning .= "\n" . $deprecationInfo;
 			}
 			return Xml::encodeJsCall(
 				'mw.log.warn',
diff --git a/resources/Resources.php b/resources/Resources.php
index 7ba1edc933..939771d1a1 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -151,9 +151,7 @@ return [
 		'targets' => [ 'mobile', 'desktop' ],
 	],
 	'jquery.appear' => [
-		'deprecated' => [
-			'message' => 'Please use "mediawiki.viewport" instead.',
-		],
+		'deprecated' => 'Please use "mediawiki.viewport" instead.',
 		'scripts' => 'resources/lib/jquery/jquery.appear.js',
 	],
 	'jquery.arrowSteps' => [
@@ -326,9 +324,7 @@ return [
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'jquery.jStorage' => [
-		'deprecated' => [
-			'message' => 'Please use "mediawiki.storage" instead.',
-		],
+		'deprecated' => 'Please use "mediawiki.storage" instead.',
 		'scripts' => 'resources/lib/jquery/jquery.jStorage.js',
 	],
 	'jquery.suggestions' => [
@@ -372,9 +368,7 @@ return [
 	/* jQuery UI */
 
 	'jquery.ui.core' => [
-		'deprecated' => [
-			'message' => 'Please use "mediawiki.ui.button" or "oojs-ui" instead.',
-		],
+		'deprecated' => 'Please use "mediawiki.ui.button" or "oojs-ui" instead.',
 		'scripts' => 'resources/lib/jquery.ui/jquery.ui.core.js',
 		'dependencies' => [
 			'jquery.ui.core.styles',
diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php
index 4a3b90a294..7d12e59ee2 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php
@@ -31,9 +31,7 @@ class ResourceLoaderFileModuleTest extends ResourceLoaderTestCase {
 				'deprecated' => true,
 			],
 			'deprecatedTomorrow' => $base + [
-				'deprecated' => [
-					'message' => 'Will be removed tomorrow.'
-				],
+				'deprecated' => 'Will be removed tomorrow.'
 			],
 
 			'htmlTemplateModule' => $base + [
-- 
2.20.1