Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop MagicWord static getters, deprecated in 1.32

Browse source 
Depends-On: I7c4400f5f84088572bad2f2aac09f24203c9bb89
Depends-On: I8322471cf35d387ebd320116360bc60e6296ec51
Change-Id: I9c790a8438f88e3a731781e25408e6bdd5f7f894
This commit is contained in:
James D. Forrester 2020-01-09 14:30:21 -08:00 committed by Jforrester
parent 9082d22754
commit 112b6f305b
2 changed files with 4 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
RELEASE-NOTES-1.35
View file

@ -216,6 +216,10 @@ because of Phabricator reports.
appropriate. appropriate.
* ContentHandler::makeParserOptions(), deprecated in 1.32, was removed. Use * ContentHandler::makeParserOptions(), deprecated in 1.32, was removed. Use
WikiPage::makeParserOptions() or ParserOptions::newCanonical() instead. 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 === === Deprecations in 1.35 ===

57
includes/MagicWord.php
View file

@ -112,63 +112,6 @@ class MagicWord {
$this->contLang = $contLang ?: MediaWikiServices::getInstance()->getContentLanguage(); $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 * Initialises this object with an ID
* *