X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMagicWord.php;h=cb58e629c1d5c8a0e5635d835121c9f6c483cf8b;hb=f0dae32ae236c7abb4ef852b2cc312740aa8b239;hp=4420d1d32790228cdc516c6763d1dc2c84590355;hpb=97af92da48f0d434cf4b541e7a3f2d96619a95b2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 4420d1d327..cb58e629c1 100644
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -55,7 +55,7 @@ use MediaWiki\MediaWikiServices;
  * @ingroup Parser
  */
 class MagicWord {
-	/**#@-*/
+	/** #@- */
 
 	/** @var string */
 	public $mId;
@@ -93,7 +93,7 @@ class MagicWord {
 	/** @var Language */
 	private $contLang;
 
-	/**#@-*/
+	/** #@- */
 
 	/**
 	 * Create a new MagicWord object
@@ -109,11 +109,7 @@ class MagicWord {
 		$this->mId = $id;
 		$this->mSynonyms = (array)$syn;
 		$this->mCaseSensitive = $cs;
-		$this->contLang = $contLang;
-
-		if ( !$contLang ) {
-			$this->contLang = MediaWikiServices::getInstance()->getContentLanguage();
-		}
+		$this->contLang = $contLang ?: MediaWikiServices::getInstance()->getContentLanguage();
 	}
 
 	/**
@@ -125,6 +121,7 @@ class MagicWord {
 	 * @deprecated since 1.32, use MagicWordFactory::get
 	 */
 	public static function get( $id ) {
+		wfDeprecated( __METHOD__, '1.32' );
 		return MediaWikiServices::getInstance()->getMagicWordFactory()->get( $id );
 	}
 
@@ -135,6 +132,7 @@ class MagicWord {
 	 * @deprecated since 1.32, use MagicWordFactory::getVariableIDs
 	 */
 	public static function getVariableIDs() {
+		wfDeprecated( __METHOD__, '1.32' );
 		return MediaWikiServices::getInstance()->getMagicWordFactory()->getVariableIDs();
 	}
 
@@ -144,6 +142,7 @@ class MagicWord {
 	 * @deprecated since 1.32, use MagicWordFactory::getSubstIDs
 	 */
 	public static function getSubstIDs() {
+		wfDeprecated( __METHOD__, '1.32' );
 		return MediaWikiServices::getInstance()->getMagicWordFactory()->getSubstIDs();
 	}
 
@@ -155,6 +154,7 @@ class MagicWord {
 	 * @deprecated since 1.32, use MagicWordFactory::getCacheTTL
 	 */
 	public static function getCacheTTL( $id ) {
+		wfDeprecated( __METHOD__, '1.32' );
 		return MediaWikiServices::getInstance()->getMagicWordFactory()->getCacheTTL( $id );
 	}
 
@@ -165,6 +165,7 @@ class MagicWord {
 	 * @deprecated since 1.32, use MagicWordFactory::getDoubleUnderscoreArray
 	 */
 	public static function getDoubleUnderscoreArray() {
+		wfDeprecated( __METHOD__, '1.32' );
 		return MediaWikiServices::getInstance()->getMagicWordFactory()->getDoubleUnderscoreArray();
 	}