From 49cdca93bed77941a6d0469f51e06d1c1c49cb72 Mon Sep 17 00:00:00 2001
From: Jeroen De Dauw <jeroendedauw@users.mediawiki.org>
Date: Tue, 13 Dec 2011 05:19:05 +0000
Subject: [PATCH] add missing deprecation notices and added deprecation version
 to existing ones

---
 includes/Action.php                    |  1 +
 includes/Article.php                   | 13 +++++++++++--
 includes/Block.php                     | 13 +++++++++++--
 includes/CategoryViewer.php            |  1 +
 includes/ChangesList.php               |  1 +
 includes/EditPage.php                  |  7 +++++++
 includes/GlobalFunctions.php           | 11 ++++++++---
 includes/HTMLForm.php                  |  2 +-
 includes/ImageGallery.php              |  2 +-
 includes/Linker.php                    | 18 ++++++++++++++++--
 includes/LogEventsList.php             |  2 +-
 includes/Title.php                     |  6 ++++--
 includes/actions/RawAction.php         |  1 +
 includes/api/ApiBase.php               |  2 ++
 includes/api/ApiMain.php               |  2 ++
 includes/api/ApiParse.php              |  2 ++
 includes/context/ContextSource.php     |  1 +
 includes/context/DerivativeContext.php |  2 ++
 includes/context/RequestContext.php    |  2 ++
 includes/db/Database.php               |  9 +++++----
 includes/db/DatabaseMysql.php          |  1 +
 includes/db/LoadBalancer.php           |  1 +
 includes/filerepo/FSRepo.php           |  2 +-
 includes/media/Exif.php                |  4 ++--
 includes/parser/ParserOptions.php      |  2 +-
 includes/search/SearchEngine.php       |  1 +
 includes/upload/UploadBase.php         |  4 ++--
 27 files changed, 89 insertions(+), 24 deletions(-)

diff --git a/includes/Action.php b/includes/Action.php
index b5e54d9b1c..655598eedc 100644
--- a/includes/Action.php
+++ b/includes/Action.php
@@ -159,6 +159,7 @@ abstract class Action {
 	 * @return Skin
 	 */
 	public final function getLang() {
+		wfDeprecated( __METHOD__, '1.19' );
 		return $this->getLanguage();
 	}
 
diff --git a/includes/Article.php b/includes/Article.php
index f073b5a75c..7623d71498 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -270,6 +270,7 @@ class Article extends Page {
 	 * @deprecated in 1.19; use fetchContent()
 	 */
 	function loadContent() {
+		wfDeprecated( __METHOD__, '1.19' );
 		$this->fetchContent();
 	}
 
@@ -338,7 +339,7 @@ class Article extends Page {
 	 * @deprecated since 1.18
 	 */
 	public function forUpdate() {
-		wfDeprecated( __METHOD__ );
+		wfDeprecated( __METHOD__, '1.18' );
 	}
 
 	/**
@@ -1620,6 +1621,7 @@ class Article extends Page {
 	 * @deprecated since 1.19
 	 */
 	public function info() {
+		wfDeprecated( __METHOD__, '1.19' );
 		Action::factory( 'info', $this )->show();
 	}
 
@@ -1628,6 +1630,7 @@ class Article extends Page {
 	 * @deprecated since 1.18
 	 */
 	public function markpatrolled() {
+		wfDeprecated( __METHOD__, '1.18' );
 		Action::factory( 'markpatrolled', $this )->show();
 	}
 
@@ -1644,6 +1647,7 @@ class Article extends Page {
 	 * @deprecated since 1.19
 	 */
 	public function revert() {
+		wfDeprecated( __METHOD__, '1.19' );
 		Action::factory( 'revert', $this )->show();
 	}
 
@@ -1652,6 +1656,7 @@ class Article extends Page {
 	 * @deprecated since 1.19
 	 */
 	public function rollback() {
+		wfDeprecated( __METHOD__, '1.19' );
 		Action::factory( 'rollback', $this )->show();
 	}
 
@@ -1661,6 +1666,7 @@ class Article extends Page {
 	 * @deprecated since 1.18
 	 */
 	public function watch() {
+		wfDeprecated( __METHOD__, '1.18' );
 		Action::factory( 'watch', $this )->show();
 	}
 
@@ -1674,6 +1680,7 @@ class Article extends Page {
 	 */
 	public function doWatch() {
 		global $wgUser;
+		wfDeprecated( __METHOD__, '1.18' );
 		return WatchAction::doWatch( $this->getTitle(), $wgUser );
 	}
 
@@ -1683,6 +1690,7 @@ class Article extends Page {
 	 * @deprecated since 1.18
 	 */
 	public function unwatch() {
+		wfDeprecated( __METHOD__, '1.18' );
 		Action::factory( 'unwatch', $this )->show();
 	}
 
@@ -1693,6 +1701,7 @@ class Article extends Page {
 	 */
 	public function doUnwatch() {
 		global $wgUser;
+		wfDeprecated( __METHOD__, '1.18' );
 		return WatchAction::doUnwatch( $this->getTitle(), $wgUser );
 	}
 
@@ -1706,7 +1715,7 @@ class Article extends Page {
 	 * @param $extraQuery String: extra query params
 	 */
 	public function doRedirect( $noRedir = false, $sectionAnchor = '', $extraQuery = '' ) {
-		wfDeprecated( __METHOD__ );
+		wfDeprecated( __METHOD__, '1.18' );
 		global $wgOut;
 
 		if ( $noRedir ) {
diff --git a/includes/Block.php b/includes/Block.php
index c153335026..9cdb9d281e 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -105,6 +105,7 @@ class Block {
 	 * @deprecated since 1.18
 	 */
 	public static function newFromDB( $address, $user = 0 ) {
+		wfDeprecated( __METHOD__, '1.18' );
 		return self::newFromTarget( User::whoIs( $user ), $address );
 	}
 
@@ -159,6 +160,7 @@ class Block {
 	 * @deprecated since 1.18
 	 */
 	public function clear() {
+		wfDeprecated( __METHOD__, '1.18' );
 		# Noop
 	}
 
@@ -171,7 +173,7 @@ class Block {
 	 * @deprecated since 1.18
 	 */
 	public function load( $address = '', $user = 0 ) {
-		wfDeprecated( __METHOD__ );
+		wfDeprecated( __METHOD__, '1.18' );
 		if( $user ){
 			$username = User::whoIs( $user );
 			$block = self::newFromTarget( $username, $address );
@@ -807,6 +809,7 @@ class Block {
 	 * @param $x Bool
 	 */
 	public function forUpdate( $x = null ) {
+		wfDeprecated( __METHOD__, '1.18' );
 		# noop
 	}
 
@@ -895,6 +898,7 @@ class Block {
 	 * @deprecated since 1.18; use $dbw->encodeExpiry() instead
 	 */
 	public static function encodeExpiry( $expiry, $db ) {
+		wfDeprecated( __METHOD__, '1.18' );
 		return $db->encodeExpiry( $expiry );
 	}
 
@@ -907,6 +911,7 @@ class Block {
 	 * @deprecated since 1.18; use $wgLang->formatExpiry() instead
 	 */
 	public static function decodeExpiry( $expiry, $timestampType = TS_MW ) {
+		wfDeprecated( __METHOD__, '1.18' );
 		global $wgContLang;
 		return $wgContLang->formatExpiry( $expiry, $timestampType );
 	}
@@ -931,6 +936,7 @@ class Block {
 	 * @deprecated since 1.18, call IP::sanitizeRange() directly
 	 */
 	public static function normaliseRange( $range ) {
+		wfDeprecated( __METHOD__, '1.18' );
 		return IP::sanitizeRange( $range );
 	}
 
@@ -950,6 +956,7 @@ class Block {
 	 * @return String
 	 */
 	public static function infinity() {
+		wfDeprecated( __METHOD__, '1.18' );
 		return wfGetDB( DB_SLAVE )->getInfinity();
 	}
 
@@ -961,6 +968,8 @@ class Block {
 	 * @deprecated since 1.18; use $wgLang->formatExpiry() instead
 	 */
 	public static function formatExpiry( $encoded_expiry ) {
+		wfDeprecated( __METHOD__, '1.18' );
+		
 		global $wgContLang;
 		static $msg = null;
 
@@ -994,7 +1003,7 @@ class Block {
 	 * @deprecated since 1.18 moved to SpecialBlock::parseExpiryInput()
 	 */
 	public static function parseExpiryInput( $expiry ) {
-		wfDeprecated( __METHOD__ );
+		wfDeprecated( __METHOD__, '1.18' );
 		return SpecialBlock::parseExpiryInput( $expiry );
 	}
 
diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php
index cfebdd1f1e..098614253c 100644
--- a/includes/CategoryViewer.php
+++ b/includes/CategoryViewer.php
@@ -159,6 +159,7 @@ class CategoryViewer extends ContextSource {
 	 * @deprecated since 1.17 kept for compatibility, please use addSubcategoryObject instead
 	 */
 	function addSubcategory( Title $title, $sortkey, $pageLength ) {
+		wfDeprecated( __METHOD__, '1.17' );
 		$this->addSubcategoryObject( Category::newFromTitle( $title ), $sortkey, $pageLength );
 	}
 
diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index eade6cb7b4..32a8d47524 100644
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -67,6 +67,7 @@ class ChangesList extends ContextSource {
 	 * @return ChangesList|EnhancedChangesList|OldChangesList derivative
 	 */
 	public static function newFromUser( $unused ) {
+		wfDeprecated( __METHOD__, '1.18' );
 		return self::newFromContext( RequestContext::getMain() );
 	}
 
diff --git a/includes/EditPage.php b/includes/EditPage.php
index b7deb822fd..7b2355a4c8 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -406,6 +406,8 @@ class EditPage {
 	 * @deprecated in 1.19; use displayPermissionsError() instead
 	 */
 	function readOnlyPage( $source = null, $protected = false, $reasons = array(), $action = null ) {
+		wfDeprecated( __METHOD__, '1.19' );
+		
 		global $wgRequest, $wgOut;
 		if ( $wgRequest->getBool( 'redlink' ) ) {
 			// The edit page was reached via a red link.
@@ -2752,6 +2754,7 @@ HTML
 	 * @deprecated in 1.19; throw an exception directly instead
 	 */
 	function blockedPage() {
+		wfDeprecated( __METHOD__, '1.19' );
 		global $wgUser;
 
 		throw new UserBlockedError( $wgUser->mBlock );
@@ -2763,6 +2766,7 @@ HTML
 	 * @deprecated in 1.19; throw an exception directly instead
 	 */
 	function userNotLoggedInPage() {
+		wfDeprecated( __METHOD__, '1.19' );
 		throw new PermissionsError( 'edit' );
 	}
 
@@ -2773,6 +2777,7 @@ HTML
 	 * @deprecated in 1.19; throw an exception directly instead
 	 */
 	function noCreatePermission() {
+		wfDeprecated( __METHOD__, '1.19' );
 		$permission = $this->mTitle->isTalkPage() ? 'createtalk' : 'createpage';
 		throw new PermissionsError( $permission );
 	}
@@ -2800,6 +2805,8 @@ HTML
 	 * @deprecated since 1.17 Use method spamPageWithContent() instead
 	 */
 	static function spamPage( $match = false ) {
+		wfDeprecated( __METHOD__, '1.17' );
+		
 		global $wgOut, $wgTitle;
 
 		$wgOut->prepareErrorPage( wfMessage( 'spamprotectiontitle' ) );
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 95f2471e2e..4db927eba6 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1153,6 +1153,7 @@ function wfGetLangObj( $langcode = false ) {
  * @return Language
  */
 function wfUILang() {
+	wfDeprecated( __METHOD__, '1.18' );
 	global $wgLang;
 	return $wgLang;
 }
@@ -1709,6 +1710,8 @@ function wfShowingResults( $offset, $limit ) {
  * @deprecated in 1.19; use Language::viewPrevNext() instead
  */
 function wfViewPrevNext( $offset, $limit, $link, $query = '', $atend = false ) {
+	wfDeprecated( __METHOD__, '1.19' );
+	
 	global $wgLang;
 
 	$query = wfCgiToArray( $query );
@@ -3024,6 +3027,7 @@ function wfRelativePath( $path, $from ) {
  * @param $commit string
  */
 function wfDoUpdates( $commit = '' ) {
+	wfDeprecated( __METHOD__, '1.19' );
 	DeferredUpdates::doUpdates( $commit );
 }
 
@@ -3123,7 +3127,7 @@ function wfBaseConvert( $input, $sourceBase, $destBase, $pad = 1, $lowercase = t
  * @deprecated since 1.18, warnings in 1.18, removal in 1.20
  */
 function wfCreateObject( $name, $p ) {
-	wfDeprecated( __FUNCTION__ );
+	wfDeprecated( __FUNCTION__, '1.18' );
 	return MWFunction::newObj( $name, $p );
 }
 
@@ -3356,6 +3360,7 @@ function wfLocalFile( $title ) {
  * @deprecated since 1.19
  */
 function wfStreamFile( $fname, $headers = array() ) {
+	wfDeprecated( __FUNCTION__, '1.19' );
 	StreamFile::stream( $fname, $headers );
 }
 
@@ -3426,7 +3431,7 @@ function wfBoolToStr( $value ) {
  * @codeCoverageIgnore
  */
 function wfLoadExtensionMessages() {
-	wfDeprecated( __FUNCTION__ );
+	wfDeprecated( __FUNCTION__, '1.16' );
 }
 
 /**
@@ -3544,7 +3549,7 @@ function wfWaitForSlaves( $maxLag = false, $wiki = false ) {
  * @deprecated since 1.18, warnings in 1.18, remove in 1.20
  */
 function wfOut( $s ) {
-	wfDeprecated( __METHOD__ );
+	wfDeprecated( __FUNCTION__, '1.18' );
 	global $wgCommandLineMode;
 	if ( $wgCommandLineMode ) {
 		echo $s;
diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index ec2486c2ab..5c0d7dbf6c 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -186,7 +186,7 @@ class HTMLForm extends ContextSource {
 	 * done already.
 	 * @deprecated since 1.18 load modules with ResourceLoader instead
 	 */
-	static function addJS() { }
+	static function addJS() { wfDeprecated( __METHOD__, '1.18' ); }
 
 	/**
 	 * Initialise a new Object for the field
diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php
index a40a685223..09f9ba883c 100644
--- a/includes/ImageGallery.php
+++ b/includes/ImageGallery.php
@@ -131,7 +131,7 @@ class ImageGallery {
 	 * @deprecated since 1.18 Not used anymore
 	 */
 	function useSkin( $skin ) {
-		wfDeprecated( __METHOD__ );
+		wfDeprecated( __METHOD__, '1.18' );
 		/* no op */
 	}
 
diff --git a/includes/Linker.php b/includes/Linker.php
index 3ccba7611e..d543524935 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -23,7 +23,7 @@ class Linker {
 	 * @deprecated since 1.18 Just pass the external class directly to something using Html::expandAttributes
 	 */
 	static function getExternalLinkAttributes( $class = 'external' ) {
-		wfDeprecated( __METHOD__ );
+		wfDeprecated( __METHOD__, '1.18' );
 		return self::getLinkAttributesInternal( '', $class );
 	}
 
@@ -359,7 +359,7 @@ class Linker {
 	 */
 	static function makeSizeLinkObj( $size, $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
 		global $wgUser;
-		wfDeprecated( __METHOD__ );
+		wfDeprecated( __METHOD__, '1.17' );
 
 		$threshold = $wgUser->getStubThreshold();
 		$colour = ( $size < $threshold ) ? 'stub' : '';
@@ -1873,6 +1873,8 @@ class Linker {
 	 *               the end of the link.
 	 */
 	static function makeBrokenLink( $title, $text = '', $query = '', $trail = '' ) {
+		wfDeprecated( __METHOD__, '1.16' );
+		
 		$nt = Title::newFromText( $title );
 		if ( $nt instanceof Title ) {
 			return self::makeBrokenLinkObj( $nt, $text, $query, $trail );
@@ -1899,6 +1901,8 @@ class Linker {
 	 * @param $prefix String: optional prefix. As trail, only before instead of after.
 	 */
 	static function makeLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
+		wfDeprecated( __METHOD__, '1.16' );
+		
 		wfProfileIn( __METHOD__ );
 		$query = wfCgiToArray( $query );
 		list( $inside, $trail ) = self::splitTrail( $trail );
@@ -1931,6 +1935,8 @@ class Linker {
 	static function makeKnownLinkObj(
 		$title, $text = '', $query = '', $trail = '', $prefix = '' , $aprops = '', $style = ''
 	) {
+		wfDeprecated( __METHOD__, '1.16' );
+		
 		wfProfileIn( __METHOD__ );
 
 		if ( $text == '' ) {
@@ -1964,6 +1970,8 @@ class Linker {
 	 * @param $prefix String: Optional prefix
 	 */
 	static function makeBrokenLinkObj( $title, $text = '', $query = '', $trail = '', $prefix = '' ) {
+		wfDeprecated( __METHOD__, '1.16' );
+		
 		wfProfileIn( __METHOD__ );
 
 		list( $inside, $trail ) = self::splitTrail( $trail );
@@ -1993,6 +2001,8 @@ class Linker {
 	 * @param $prefix String: Optional prefix
 	 */
 	static function makeColouredLinkObj( $nt, $colour, $text = '', $query = '', $trail = '', $prefix = '' ) {
+		wfDeprecated( __METHOD__, '1.16' );
+		
 		if ( $colour != '' ) {
 			$style = self::getInternalLinkAttributesObj( $nt, $text, $colour );
 		} else {
@@ -2023,9 +2033,13 @@ class Linker {
 
 	/**
 	 * @deprecated since 1.14
+	 * TODO: remove?!
+	 * 
 	 * Returns raw bits of HTML, use titleAttrib()
 	 */
 	public static function tooltip( $name, $options = null ) {
+		wfDeprecated( __METHOD__, '1.14' );
+		
 		# @todo FIXME: If Sanitizer::expandAttributes() treated "false" as "output
 		# no attribute" instead of "output '' as value for attribute", this
 		# would be two lines.
diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index e73d0a6710..0d31e403ec 100644
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -77,7 +77,7 @@ class LogEventsList {
 	 * @deprecated in 1.19
 	 */
 	public function showHeader( $type ) {
-		wfDeprecated( __METHOD__ );
+		wfDeprecated( __METHOD__, '1.19' );
 		// If only one log type is used, then show a special message...
 		$headerType = (count($type) == 1) ? $type[0] : '';
 		if( LogPage::isLogType( $headerType ) ) {
diff --git a/includes/Title.php b/includes/Title.php
index e4c6f69f11..6765ac7e15 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -973,6 +973,7 @@ class Title {
 	 * @deprecated since 1.17
 	 */
 	public function isValidCssJsSubpage() {
+		wfDeprecated( __METHOD__, '1.17' );
 		return $this->isCssJsSubpage();
 	}
 
@@ -1525,6 +1526,7 @@ class Title {
 	 * @todo fold these checks into userCan()
 	 */
 	public function userCanRead() {
+		wfDeprecated( __METHOD__, '1.19' );
 		return $this->userCan( 'read' );
 	}
 
@@ -2131,7 +2133,7 @@ class Title {
 	 */
 	public function userCanEditCssSubpage() {
 		global $wgUser;
-		wfDeprecated( __METHOD__ );
+		wfDeprecated( __METHOD__, '1.19' );
 		return ( ( $wgUser->isAllowedAll( 'editusercssjs', 'editusercss' ) )
 			|| preg_match( '/^' . preg_quote( $wgUser->getName(), '/' ) . '\//', $this->mTextform ) );
 	}
@@ -2145,7 +2147,7 @@ class Title {
 	 */
 	public function userCanEditJsSubpage() {
 		global $wgUser;
-		wfDeprecated( __METHOD__ );
+		wfDeprecated( __METHOD__, '1.19' );
 		return ( ( $wgUser->isAllowedAll( 'editusercssjs', 'edituserjs' ) )
 			   || preg_match( '/^' . preg_quote( $wgUser->getName(), '/' ) . '\//', $this->mTextform ) );
 	}
diff --git a/includes/actions/RawAction.php b/includes/actions/RawAction.php
index 6bf7a53376..5f617d753f 100644
--- a/includes/actions/RawAction.php
+++ b/includes/actions/RawAction.php
@@ -210,6 +210,7 @@ class RawPage extends RawAction {
 	public $mOldId;
 
 	function __construct( Page $page, $request = false ) {
+		wfDeprecated( __CLASS__, '1.19' );
 		parent::__construct( $page );
 
 		if ( $request !== false ) {
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index b1c2df6130..e1ba493ff3 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -187,6 +187,7 @@ abstract class ApiBase extends ContextSource {
 	 * @return DerivativeContext
 	 */
 	public function createContext() {
+		wfDeprecated( __METHOD__, '1.19' );
 		return new DerivativeContext( $this->getContext() );
 	}
 
@@ -673,6 +674,7 @@ abstract class ApiBase extends ContextSource {
 	 * @return array
 	 */
 	public static function getValidNamespaces() {
+		wfDeprecated( __METHOD__, '1.17' );
 		return MWNamespace::getValidNamespaces();
 	}
 
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index fd6a7fb938..376f44c826 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -286,6 +286,7 @@ class ApiMain extends ApiBase {
 	 * $this->setCacheMode('private')
 	 */
 	public function setCachePrivate() {
+		wfDeprecated( __METHOD__, '1.17' );
 		$this->setCacheMode( 'private' );
 	}
 
@@ -314,6 +315,7 @@ class ApiMain extends ApiBase {
 	 * @deprecated since 1.17 Use setCacheMode( 'anon-public-user-private' )
 	 */
 	public function setVaryCookie() {
+		wfDeprecated( __METHOD__, '1.17' );
 		$this->setCacheMode( 'anon-public-user-private' );
 	}
 
diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index 88eeca7ef3..03910516d4 100644
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -382,6 +382,8 @@ class ApiParse extends ApiBase {
 	 * @return string
 	 */
 	private function languagesHtml( $languages ) {
+		wfDeprecated( __METHOD__, '1.18' );
+		
 		global $wgContLang, $wgHideInterlanguageLinks;
 
 		if ( $wgHideInterlanguageLinks || count( $languages ) == 0 ) {
diff --git a/includes/context/ContextSource.php b/includes/context/ContextSource.php
index 5fc8eba54f..5476b25142 100644
--- a/includes/context/ContextSource.php
+++ b/includes/context/ContextSource.php
@@ -100,6 +100,7 @@ abstract class ContextSource implements IContextSource {
 	 * @return Language
 	 */
 	public function getLang() {
+		wfDeprecated( __METHOD__, '1.19' );
 		return $this->getLanguage();
 	}
 
diff --git a/includes/context/DerivativeContext.php b/includes/context/DerivativeContext.php
index cff827cf78..1cd649f28b 100644
--- a/includes/context/DerivativeContext.php
+++ b/includes/context/DerivativeContext.php
@@ -162,6 +162,7 @@ class DerivativeContext extends ContextSource {
 	 * @param $l Mixed Language instance or language code
 	 */
 	public function setLang( $l ) {
+		wfDeprecated( __METHOD__, '1.19' );
 		$this->setLanguage( $l );
 	}
 
@@ -188,6 +189,7 @@ class DerivativeContext extends ContextSource {
 	 * @return Language
 	 */
 	public function getLang() {
+		wfDeprecated( __METHOD__, '1.19' );
 		$this->getLanguage();
 	}
 
diff --git a/includes/context/RequestContext.php b/includes/context/RequestContext.php
index b2568e4cc6..8c85605074 100644
--- a/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@ -170,6 +170,7 @@ class RequestContext implements IContextSource {
 	 * @param $l Mixed Language instance or language code
 	 */
 	public function setLang( $l ) {
+		wfDeprecated( __METHOD__, '1.19' );
 		$this->setLanguage( $l );
 	}
 
@@ -196,6 +197,7 @@ class RequestContext implements IContextSource {
 	 * @return Language
 	 */
 	public function getLang() {
+		wfDeprecated( __METHOD__, '1.19' );
 		return $this->getLanguage();
 	}
 
diff --git a/includes/db/Database.php b/includes/db/Database.php
index 6bc5bbad5d..bddce2b3af 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -631,7 +631,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @return DatabaseMysql
 	 */
 	static function newFromParams( $server, $user, $password, $dbName, $flags = 0 ) {
-		wfDeprecated( __METHOD__ );
+		wfDeprecated( __METHOD__, '1.17' );
 		return new DatabaseMysql( $server, $user, $password, $dbName, $flags );
 	}
 
@@ -641,7 +641,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @see Database::factory()
 	 */
 	public final static function newFromType( $dbType, $p = array() ) {
-		wfDeprecated( __METHOD__ );
+		wfDeprecated( __METHOD__, '1.18' );
 		if ( isset( $p['tableprefix'] ) ) {
 			$p['tablePrefix'] = $p['tableprefix'];
 		}
@@ -2204,7 +2204,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @return string
 	 */
 	function quote_ident( $s ) {
-		wfDeprecated( __METHOD__ );
+		wfDeprecated( __METHOD__, '1.18' );
 		return $this->addIdentifierQuotes( $s );
 	}
 
@@ -2219,7 +2219,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @return string
 	 */
 	public function escapeLike( $s ) {
-		wfDeprecated( __METHOD__ );
+		wfDeprecated( __METHOD__, '1.17' );
 		return $this->escapeLikeInternal( $s );
 	}
 
@@ -3056,6 +3056,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 * @deprecated since 1.19; use setSessionOptions()
 	 */
 	public function setTimeout( $timeout ) {
+		wfDeprecated( __METHOD__, '1.19' );
 		$this->setSessionOptions( array( 'connTimeout' => $timeout ) );
 	}
 
diff --git a/includes/db/DatabaseMysql.php b/includes/db/DatabaseMysql.php
index cdec384a2d..7054c8bb25 100644
--- a/includes/db/DatabaseMysql.php
+++ b/includes/db/DatabaseMysql.php
@@ -511,6 +511,7 @@ class DatabaseMysql extends DatabaseBase {
 	 * @return bool|int
 	 */
 	function getLagFromProcesslist() {
+		wfDeprecated( __METHOD__, '1.19' );
 		$res = $this->query( 'SHOW PROCESSLIST', __METHOD__ );
 		if( !$res ) {
 			return false;
diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 8b8678463e..55ce599ba7 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -858,6 +858,7 @@ class LoadBalancer {
 	 * @param $conn
 	 */
 	function closeConnecton( $conn ) {
+		wfDeprecated( __METHOD__, '1.18' );
 		$this->closeConnection( $conn );
 	}
 
diff --git a/includes/filerepo/FSRepo.php b/includes/filerepo/FSRepo.php
index 583df738c8..cec4c23f7e 100644
--- a/includes/filerepo/FSRepo.php
+++ b/includes/filerepo/FSRepo.php
@@ -368,7 +368,7 @@ class FSRepo extends FileRepo {
 	 * @return Status
 	 */
 	function append( $srcPath, $toAppendPath, $flags = 0 ) {
-		wfDeprecated(__METHOD__);
+		wfDeprecated( __METHOD__, '1.19' );
 		
 		$status = $this->newGood();
 
diff --git a/includes/media/Exif.php b/includes/media/Exif.php
index 345a6f19e4..b418e17539 100644
--- a/includes/media/Exif.php
+++ b/includes/media/Exif.php
@@ -537,7 +537,7 @@ class Exif {
 	 * @deprecated since 1.18
 	 */
 	function makeFormattedData( ) {
-		wfDeprecated( __METHOD__ );
+		wfDeprecated( __METHOD__, '1.18' );
 		$this->mFormattedExifData = FormatMetadata::getFormattedData(
 			$this->mFilteredExifData );
 	}
@@ -569,7 +569,7 @@ class Exif {
 	 * @deprecated since 1.18
 	 */
 	function getFormattedData() {
-		wfDeprecated( __METHOD__ );
+		wfDeprecated( __METHOD__, '1.18' );
 		if (!$this->mFormattedExifData) {
 			$this->makeFormattedData();
 		}
diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index f26a2e4d8e..0b48032d29 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -96,7 +96,7 @@ class ParserOptions {
 	 * @deprecated since 1.18 Use Linker::* instead
 	 */
 	function getSkin( $title = null ) {
-		wfDeprecated( __METHOD__ );
+		wfDeprecated( __METHOD__, '1.18' );
 		return new DummyLinker;
 	}
 
diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index b09373f330..b3f5da9099 100644
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -67,6 +67,7 @@ class SearchEngine {
 	 * @deprecated since 1.18 Call supports( 'list-redirects' );
 	 */
 	function acceptListRedirects() {
+		wfDeprecated( __METHOD__, '1.18' );
 		return $this->supports( 'list-redirects' );
 	}
 
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 5a4e269571..8d4cb5db6a 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -206,7 +206,7 @@ abstract class UploadBase {
 	 * @return Status Status
 	 */
 	protected function appendToUploadFile( $srcPath, $toAppendPath ) {
-		wfDeprecated(__METHOD__);
+		wfDeprecated( __METHOD__, '1.19' );
 		
 		$repo = RepoGroup::singleton()->getLocalRepo();
 		$status = $repo->append( $srcPath, $toAppendPath );
@@ -222,7 +222,7 @@ abstract class UploadBase {
 	 * @return Status Status
 	 */
 	protected function appendFinish( $toAppendPath ) {
-		wfDeprecated(__METHOD__);
+		wfDeprecated( __METHOD__, '1.19' );
 		
 		$repo = RepoGroup::singleton()->getLocalRepo();
 		$status = $repo->appendFinish( $toAppendPath );
-- 
2.20.1