From 44f16d2fb80d11d97646ab4716a77c5514145b56 Mon Sep 17 00:00:00 2001
From: IoannisKydonis <gianiskido@gmail.com>
Date: Mon, 18 Jan 2016 18:36:38 +0200
Subject: [PATCH] Remove Deprecated methods from ParserOutput.php

Remove ParserOutput::getSecondaryDataUpdates and
ParserOutput::addSecondaryDataUpdate
Deprecated since 1.25, slated for removal in 1.26 but not done.

Change-Id: Id5e41003fe47b55f493f636c69c9b31932cde9b8
---
 RELEASE-NOTES-1.27               |  2 ++
 includes/parser/ParserOutput.php | 43 --------------------------------
 2 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 3be3e21703..def80ea846 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -285,6 +285,8 @@ changes to languages because of Phabricator reports.
 * User::generateToken() was removed (deprecated since 1.20).
 * WikiPage::getRawText() was removed (deprecated since 1.21).
 * ParserOutput::hasCustomDataUpdates() was removed (deprecated since 1.25).
+* ParserOutput::addSecondaryDataUpdate() was removed (deprecated since 1.25).
+* ParserOutput::getSecondaryDataUpdates() was removed (deprecated since 1.25).
 
 == Compatibility ==
 
diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index 3a35e042a7..72668bf68f 100644
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -855,49 +855,6 @@ class ParserOutput extends CacheTime {
 		$this->mAccessedOptions[$option] = true;
 	}
 
-	/**
-	 * @deprecated since 1.25. Instead, store any relevant data using setExtensionData,
-	 *    and implement Content::getSecondaryDataUpdates() if possible, or use the
-	 *    'SecondaryDataUpdates' hook to construct the necessary update objects.
-	 *
-	 * @note Hard deprecation and removal without long deprecation period, since there are no
-	 *       known users, but known conceptual issues.
-	 *
-	 * @todo remove in 1.26
-	 *
-	 * @param DataUpdate $update
-	 *
-	 * @throws MWException
-	 */
-	public function addSecondaryDataUpdate( DataUpdate $update ) {
-		wfDeprecated( __METHOD__, '1.25' );
-		throw new MWException(
-			'ParserOutput::addSecondaryDataUpdate() is no longer supported. ' .
-				'Override Content::getSecondaryDataUpdates() ' .
-				'or use the SecondaryDataUpdates hook instead.'
-		);
-	}
-
-	/**
-	 * @deprecated since 1.25. Instead, store any relevant data using setExtensionData,
-	 *    and implement Content::getSecondaryDataUpdates() if possible, or use the
-	 *    'SecondaryDataUpdates' hook to construct the necessary update objects.
-	 *
-	 * @note Hard deprecation and removal without long deprecation period, since there are no
-	 *       known users, but known conceptual issues.
-	 *
-	 * @todo remove in 1.26
-	 *
-	 * @param Title $title
-	 * @param bool $recursive
-	 *
-	 * @return array An array of instances of DataUpdate
-	 */
-	public function getSecondaryDataUpdates( Title $title = null, $recursive = true ) {
-		wfDeprecated( __METHOD__, '1.25' );
-		return array();
-	}
-
 	/**
 	 * Attaches arbitrary data to this ParserObject. This can be used to store some information in
 	 * the ParserOutput object for later use during page output. The data will be cached along with
-- 
2.20.1