From: Reedy <reedy@wikimedia.org>
Date: Fri, 1 Apr 2016 19:38:11 +0000 (+0100)
Subject: Removed ApiMain::(getFormats|addFormat|addModule|getShowVersions).
X-Git-Tag: 1.31.0-rc.0~7446
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=9593b60855d209cb2db601ca45cac00f7b49a1a6;p=lhc%2Fweb%2Fwiklou.git

Removed ApiMain::(getFormats|addFormat|addModule|getShowVersions).

Deprecated since 1.21

Bug: T122754
Change-Id: Id5cbc50e45cdfdfeb2e92faffc7ded868a350f4b
---

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 8adb498b7f..b3408f8df9 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -109,6 +109,10 @@ HHVM 3.1.
   module should express a dependency on it.
 * Removed configuration option $wgCopyrightIcon (deprecated since 1.18). Use
   $wgFooterIcons['copyright']['copyright'] instead.
+* ApiMain::getShowVersions() was removed (deprecated in 1.21).
+* ApiMain::addModule() was removed (deprecated in 1.21).
+* ApiMain::addFormat() was removed (deprecated in 1.21).
+* ApiMain::getFormats() was removed (deprecated in 1.21).
 
 === New features in 1.27 ===
 * $wgDataCenterUpdateStickTTL was also added. This decides how long a user
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index e3725116d1..07642c48ed 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -1816,53 +1816,6 @@ class ApiMain extends ApiBase {
 		return "* $paramName={$module->getModuleName()} $modulePrefix*";
 	}
 
-	/**
-	 * Check whether the user wants us to show version information in the API help
-	 * @return bool
-	 * @deprecated since 1.21, always returns false
-	 */
-	public function getShowVersions() {
-		wfDeprecated( __METHOD__, '1.21' );
-
-		return false;
-	}
-
-	/**
-	 * Add or overwrite a module in this ApiMain instance. Intended for use by extending
-	 * classes who wish to add their own modules to their lexicon or override the
-	 * behavior of inherent ones.
-	 *
-	 * @deprecated since 1.21, Use getModuleManager()->addModule() instead.
-	 * @param string $name The identifier for this module.
-	 * @param ApiBase $class The class where this module is implemented.
-	 */
-	protected function addModule( $name, $class ) {
-		$this->getModuleManager()->addModule( $name, 'action', $class );
-	}
-
-	/**
-	 * Add or overwrite an output format for this ApiMain. Intended for use by extending
-	 * classes who wish to add to or modify current formatters.
-	 *
-	 * @deprecated since 1.21, Use getModuleManager()->addModule() instead.
-	 * @param string $name The identifier for this format.
-	 * @param ApiFormatBase $class The class implementing this format.
-	 */
-	protected function addFormat( $name, $class ) {
-		$this->getModuleManager()->addModule( $name, 'format', $class );
-	}
-
-	/**
-	 * Returns the list of supported formats in form ( 'format' => 'ClassName' )
-	 *
-	 * @since 1.18
-	 * @deprecated since 1.21, Use getModuleManager()'s methods instead.
-	 * @return array
-	 */
-	public function getFormats() {
-		return $this->getModuleManager()->getNamesWithClasses( 'format' );
-	}
-
 	/**@}*/
 
 }