From e45e0b1a666c73e9c61c700ce36b7831a81269fa Mon Sep 17 00:00:00 2001
From: withoutaname <drevitchi@gmail.com>
Date: Sun, 15 Jun 2014 23:52:12 -0700
Subject: [PATCH] Removed getLang() from IContextSource and subclasses

Change-Id: I94c3df814c06c54c071f371101882dcc71c99417
---
 RELEASE-NOTES-1.24                     |  1 +
 includes/actions/Action.php            | 11 -----------
 includes/context/ContextSource.php     | 12 ------------
 includes/context/DerivativeContext.php |  9 ---------
 includes/context/IContextSource.php    |  8 --------
 includes/context/RequestContext.php    | 10 ----------
 includes/specialpage/SpecialPage.php   | 13 -------------
 7 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index edc826394e..20c70002bf 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -165,6 +165,7 @@ changes to languages because of Bugzilla reports.
   for migration guide for creators and users of custom skins that relied on it.
 * ResourceLoaderFileModule#getAllStyleFiles now returns all style files and all
   skin style files used by the module.
+* Removed getLang() from IContextSource and subclasses. (deprecated since 1.19)
 
 ==== Renamed classes ====
 * CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression
diff --git a/includes/actions/Action.php b/includes/actions/Action.php
index 8fb104d9b3..d4b08b2e70 100644
--- a/includes/actions/Action.php
+++ b/includes/actions/Action.php
@@ -222,17 +222,6 @@ abstract class Action {
 		return $this->getContext()->getLanguage();
 	}
 
-	/**
-	 * Shortcut to get the user Language being used for this instance
-	 *
-	 * @deprecated since 1.19 Use getLanguage instead
-	 * @return Language
-	 */
-	final public function getLang() {
-		wfDeprecated( __METHOD__, '1.19' );
-		return $this->getLanguage();
-	}
-
 	/**
 	 * Shortcut to get the Title object from the page
 	 * @return Title
diff --git a/includes/context/ContextSource.php b/includes/context/ContextSource.php
index 4a3c2cbfa9..d0c0bdccfc 100644
--- a/includes/context/ContextSource.php
+++ b/includes/context/ContextSource.php
@@ -134,18 +134,6 @@ abstract class ContextSource implements IContextSource {
 		return $this->getContext()->getUser();
 	}
 
-	/**
-	 * Get the Language object
-	 *
-	 * @deprecated since 1.19 Use getLanguage instead
-	 * @return Language
-	 */
-	public function getLang() {
-		wfDeprecated( __METHOD__, '1.19' );
-
-		return $this->getLanguage();
-	}
-
 	/**
 	 * Get the Language object
 	 *
diff --git a/includes/context/DerivativeContext.php b/includes/context/DerivativeContext.php
index 4a7b46693c..edf9e1ded8 100644
--- a/includes/context/DerivativeContext.php
+++ b/includes/context/DerivativeContext.php
@@ -267,15 +267,6 @@ class DerivativeContext extends ContextSource {
 		}
 	}
 
-	/**
-	 * @deprecated since 1.19 Use getLanguage instead
-	 * @return Language
-	 */
-	public function getLang() {
-		wfDeprecated( __METHOD__, '1.19' );
-		$this->getLanguage();
-	}
-
 	/**
 	 * Get the Language object
 	 *
diff --git a/includes/context/IContextSource.php b/includes/context/IContextSource.php
index 5534ee3028..f718103d45 100644
--- a/includes/context/IContextSource.php
+++ b/includes/context/IContextSource.php
@@ -76,14 +76,6 @@ interface IContextSource {
 	 */
 	public function getUser();
 
-	/**
-	 * Get the Language object
-	 *
-	 * @deprecated since 1.19 Use getLanguage instead
-	 * @return Language
-	 */
-	public function getLang();
-
 	/**
 	 * Get the Language object
 	 *
diff --git a/includes/context/RequestContext.php b/includes/context/RequestContext.php
index c87bfc03ab..1754a9d115 100644
--- a/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@ -298,16 +298,6 @@ class RequestContext implements IContextSource {
 		}
 	}
 
-	/**
-	 * @deprecated since 1.19 Use getLanguage instead
-	 * @return Language
-	 */
-	public function getLang() {
-		wfDeprecated( __METHOD__, '1.19' );
-
-		return $this->getLanguage();
-	}
-
 	/**
 	 * Get the Language object.
 	 * Initialization of user or request objects can depend on this.
diff --git a/includes/specialpage/SpecialPage.php b/includes/specialpage/SpecialPage.php
index da51a33f7d..ec8635c1e2 100644
--- a/includes/specialpage/SpecialPage.php
+++ b/includes/specialpage/SpecialPage.php
@@ -551,19 +551,6 @@ class SpecialPage {
 		return $this->getContext()->getSkin();
 	}
 
-	/**
-	 * Shortcut to get user's language
-	 *
-	 * @deprecated since 1.19 Use getLanguage instead
-	 * @return Language
-	 * @since 1.18
-	 */
-	public function getLang() {
-		wfDeprecated( __METHOD__, '1.19' );
-
-		return $this->getLanguage();
-	}
-
 	/**
 	 * Shortcut to get user's language
 	 *
-- 
2.20.1