diff --git a/RELEASE-NOTES-1.35 b/RELEASE-NOTES-1.35 index 86098c2d8e2..9f976647df9 100644 --- a/RELEASE-NOTES-1.35 +++ b/RELEASE-NOTES-1.35 @@ -216,6 +216,10 @@ because of Phabricator reports. appropriate. * ContentHandler::makeParserOptions(), deprecated in 1.32, was removed. Use WikiPage::makeParserOptions() or ParserOptions::newCanonical() instead. +* The remaining static methods for MagicWord, deprecated in 1.32, were removed. + These were MagicWord::get(), ::getSubstIDs(), ::getDoubleUnderscoreArray(), + ::getVariableIDs(), and ::getCacheTTL(). Instead, use MagicWordFactory (via + MediaWikiServices). * … === Deprecations in 1.35 === diff --git a/includes/MagicWord.php b/includes/MagicWord.php index cb58e629c1d..b9a776b34b0 100644 --- a/includes/MagicWord.php +++ b/includes/MagicWord.php @@ -112,63 +112,6 @@ class MagicWord { $this->contLang = $contLang ?: MediaWikiServices::getInstance()->getContentLanguage(); } - /** - * Factory: creates an object representing an ID - * - * @param string $id The internal name of the magic word - * - * @return MagicWord - * @deprecated since 1.32, use MagicWordFactory::get - */ - public static function get( $id ) { - wfDeprecated( __METHOD__, '1.32' ); - return MediaWikiServices::getInstance()->getMagicWordFactory()->get( $id ); - } - - /** - * Get an array of parser variable IDs - * - * @return string[] - * @deprecated since 1.32, use MagicWordFactory::getVariableIDs - */ - public static function getVariableIDs() { - wfDeprecated( __METHOD__, '1.32' ); - return MediaWikiServices::getInstance()->getMagicWordFactory()->getVariableIDs(); - } - - /** - * Get an array of parser substitution modifier IDs - * @return string[] - * @deprecated since 1.32, use MagicWordFactory::getSubstIDs - */ - public static function getSubstIDs() { - wfDeprecated( __METHOD__, '1.32' ); - return MediaWikiServices::getInstance()->getMagicWordFactory()->getSubstIDs(); - } - - /** - * Allow external reads of TTL array - * - * @param string $id - * @return int - * @deprecated since 1.32, use MagicWordFactory::getCacheTTL - */ - public static function getCacheTTL( $id ) { - wfDeprecated( __METHOD__, '1.32' ); - return MediaWikiServices::getInstance()->getMagicWordFactory()->getCacheTTL( $id ); - } - - /** - * Get a MagicWordArray of double-underscore entities - * - * @return MagicWordArray - * @deprecated since 1.32, use MagicWordFactory::getDoubleUnderscoreArray - */ - public static function getDoubleUnderscoreArray() { - wfDeprecated( __METHOD__, '1.32' ); - return MediaWikiServices::getInstance()->getMagicWordFactory()->getDoubleUnderscoreArray(); - } - /** * Initialises this object with an ID *