From 9093af0a2874e8bd0f1dc14dc3ba88fff56a4c89 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Mon, 25 Jul 2016 21:51:57 +0100
Subject: [PATCH] Remove modulemessages from ApiParse and Output (deprecated in
 1.26)

No uses of 'modulemessages', getModuleMessages() or addModuleMessages()
anywhere in Wikimedia Git.

Change-Id: I59420880f3545d1aabf9bcbea1e34b1475697d26
---
 RELEASE-NOTES-1.28               |  2 ++
 includes/OutputPage.php          | 23 -----------------------
 includes/api/ApiParse.php        |  4 ----
 includes/parser/ParserOutput.php | 17 -----------------
 4 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index c8bf207b16..97e1be617d 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -51,6 +51,8 @@ production.
 === Action API changes in 1.28 ===
 * Added 'maxarticlesize' property to action=query&meta=siteinfo which contains
   the value of $wgMaxArticleSize.
+* Property 'modulemessages' from action=parse&prop=modules was removed
+  (deprecated since 1.26).
 
 === Action API internal changes in 1.28 ===
 * Added a new hook, 'ApiMakeParserOptions', to allow extensions to better
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index ecc719a044..f6119802e2 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -604,29 +604,6 @@ class OutputPage extends ContextSource {
 		$this->mModuleStyles = array_merge( $this->mModuleStyles, (array)$modules );
 	}
 
-	/**
-	 * Get the list of module messages to include on this page
-	 *
-	 * @deprecated since 1.26 Obsolete
-	 * @param bool $filter
-	 * @param string|null $position
-	 * @return array Array of module names
-	 */
-	public function getModuleMessages( $filter = false, $position = null ) {
-		wfDeprecated( __METHOD__, '1.26' );
-		return [];
-	}
-
-	/**
-	 * Load messages of one or more ResourceLoader modules.
-	 *
-	 * @deprecated since 1.26 Use addModules() instead
-	 * @param string|array $modules Module name (string) or array of module names
-	 */
-	public function addModuleMessages( $modules ) {
-		wfDeprecated( __METHOD__, '1.26' );
-	}
-
 	/**
 	 * @return null|string ResourceLoader target
 	 */
diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index 3e66cadbee..d53dbb485f 100644
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -375,9 +375,6 @@ class ApiParse extends ApiBase {
 			$result_array['modules'] = array_values( array_unique( $p_result->getModules() ) );
 			$result_array['modulescripts'] = array_values( array_unique( $p_result->getModuleScripts() ) );
 			$result_array['modulestyles'] = array_values( array_unique( $p_result->getModuleStyles() ) );
-			// To be removed in 1.27
-			$result_array['modulemessages'] = [];
-			$this->setWarning( 'modulemessages is deprecated since MediaWiki 1.26' );
 		}
 
 		if ( isset( $prop['jsconfigvars'] ) ) {
@@ -461,7 +458,6 @@ class ApiParse extends ApiBase {
 			'indicators' => 'ind',
 			'modulescripts' => 'm',
 			'modulestyles' => 'm',
-			'modulemessages' => 'm',
 			'properties' => 'pp',
 			'limitreportdata' => 'lr',
 		];
diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index 3462d10c7d..73d4e69008 100644
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -367,15 +367,6 @@ class ParserOutput extends CacheTime {
 		return $this->mModuleStyles;
 	}
 
-	/**
-	 * @deprecated since 1.26 Obsolete
-	 * @return array
-	 */
-	public function getModuleMessages() {
-		wfDeprecated( __METHOD__, '1.26' );
-		return [];
-	}
-
 	/** @since 1.23 */
 	public function getJsConfigVars() {
 		return $this->mJsConfigVars;
@@ -644,14 +635,6 @@ class ParserOutput extends CacheTime {
 		$this->mModuleStyles = array_merge( $this->mModuleStyles, (array)$modules );
 	}
 
-	/**
-	 * @deprecated since 1.26 Use addModules() instead
-	 * @param string|array $modules
-	 */
-	public function addModuleMessages( $modules ) {
-		wfDeprecated( __METHOD__, '1.26' );
-	}
-
 	/**
 	 * Add one or more variables to be set in mw.config in JavaScript.
 	 *
-- 
2.20.1