From: James D. Forrester <jforrester@wikimedia.org>
Date: Fri, 21 Jun 2019 21:10:00 +0000 (-0700)
Subject: SkinFactory: Drop getDefaultInstance(), deprecated in 1.27
X-Git-Tag: 1.34.0-rc.0~1287^2~3
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=d5cf7a4961cf37c1845f8998c849fd8dc4813b6d;p=lhc%2Fweb%2Fwiklou.git

SkinFactory: Drop getDefaultInstance(), deprecated in 1.27

Change-Id: I40313382c77a1521b80b70a55778db5da1a8a866
---

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 05c43cdc0d..0ca5adbd00 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -236,6 +236,8 @@ because of Phabricator reports.
   TitlePrefixSearch or StringPrefixSearch classes instead.
 * The UserRights hook, deprecated in 1.26, has been removed. Instead, use the
   UserGroupsChanged hook.
+* Skin::getDefaultInstance(), deprecated in 1.27, has been removed. Get the
+  instance from MediaWikiServices instead.
 * …
 
 === Deprecations in 1.34 ===
diff --git a/includes/skins/SkinFactory.php b/includes/skins/SkinFactory.php
index eb71fe6f35..98d3456adc 100644
--- a/includes/skins/SkinFactory.php
+++ b/includes/skins/SkinFactory.php
@@ -21,8 +21,6 @@
  * @file
  */
 
-use MediaWiki\MediaWikiServices;
-
 /**
  * Factory class to create Skin objects
  *
@@ -43,15 +41,6 @@ class SkinFactory {
 	 */
 	private $displayNames = [];
 
-	/**
-	 * @deprecated in 1.27
-	 * @return SkinFactory
-	 */
-	public static function getDefaultInstance() {
-		wfDeprecated( __METHOD__, '1.27' );
-		return MediaWikiServices::getInstance()->getSkinFactory();
-	}
-
 	/**
 	 * Register a new Skin factory function.
 	 *