From dcdf25f0b513e1b84f0c423ff7e8be0e8fa6c033 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= <matma.rex@gmail.com>
Date: Tue, 2 Aug 2016 23:48:24 +0200
Subject: [PATCH] Skin: Remove long-deprecated aliases for Linker methods

They don't seem to be used anymore in any skins in our version control.
I searched for:

  (->|(?<!Linker)::)(commentBlock|generateRollback|link|linkKnown|userLink|userToolLinks)

Change-Id: Id558c2d307dc6e9fbf0e642d5d638f7c2c9544b2
---
 RELEASE-NOTES-1.28      |  7 ++++++
 includes/skins/Skin.php | 52 -----------------------------------------
 2 files changed, 7 insertions(+), 52 deletions(-)

diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index 9acd1d8049..e26cd72338 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -89,6 +89,13 @@ changes to languages because of Phabricator reports.
   MediaWiki\Linker\LinkRenderer. In addition, the LinkBegin and LinkEnd hooks
   were replaced by HtmlPageLinkRendererBegin and HtmlPageLinkRendererEnd
   respectively. See docs/hooks.txt for the specific changes needed for those hooks.
+* Aliases for Linker methods, deprecated since 1.21, were removed from Skin:
+  * Skin::commentBlock() (use Linker::commentBlock() instead)
+  * Skin::generateRollback() (use Linker::generateRollback() instead)
+  * Skin::link() (use MediaWiki\Linker\LinkRenderer instead)
+  * Skin::linkKnown() (use MediaWiki\Linker\LinkRenderer instead)
+  * Skin::userLink() (use Linker::userLink() instead)
+  * Skin::userToolLinks() (use Linker::userToolLinks() instead)
 * The 'ParserLimitReportFormat' hook was removed.
 * Disabled "bug 2702" HTML tidying of parsed UI messages on wikis where Tidy is
   disabled.
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 64d2f8bd45..d4732518b2 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -1566,56 +1566,4 @@ abstract class Skin extends ContextSource {
 		return $result;
 	}
 
-	/** @deprecated in 1.21 */
-	public function commentBlock( $comment, $title = null, $local = false, $wikiId = null ) {
-		wfDeprecated( __METHOD__, '1.21' );
-		return Linker::commentBlock( $comment, $title, $local, $wikiId );
-	}
-
-	/** @deprecated in 1.21 */
-	public function generateRollback(
-		$rev,
-		IContextSource $context = null,
-		$options = [ 'verify' ]
-	) {
-		wfDeprecated( __METHOD__, '1.21' );
-		return Linker::generateRollback( $rev, $context, $options );
-	}
-
-	/** @deprecated in 1.21 */
-	public function link( $target, $html = null, $customAttribs = [], $query = [], $options = [] ) {
-		wfDeprecated( __METHOD__, '1.21' );
-		return Linker::link( $target, $html, $customAttribs, $query, $options );
-	}
-
-	/** @deprecated in 1.21 */
-	public function linkKnown(
-		$target,
-		$html = null,
-		$customAttribs = [],
-		$query = [],
-		$options = [ 'known', 'noclasses' ]
-	) {
-		wfDeprecated( __METHOD__, '1.21' );
-		return Linker::linkKnown( $target, $html, $customAttribs, $query, $options );
-	}
-
-	/** @deprecated in 1.21 */
-	public function userLink( $userId, $userName, $altUserName = false ) {
-		wfDeprecated( __METHOD__, '1.21' );
-		return Linker::userLink( $userId, $userName, $altUserName );
-	}
-
-	/** @deprecated in 1.21 */
-	public function userToolLinks(
-		$userId,
-		$userText,
-		$redContribsWhenNoEdits = false,
-		$flags = 0,
-		$edits = null
-	) {
-		wfDeprecated( __METHOD__, '1.21' );
-		return Linker::userToolLinks( $userId, $userText, $redContribsWhenNoEdits, $flags, $edits );
-	}
-
 }
-- 
2.20.1