SkinFactory: Drop getDefaultInstance(), deprecated in 1.27

Change-Id: I40313382c77a1521b80b70a55778db5da1a8a866

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 05c43cd..0ca5adb 100644 (file)
--- 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 eb71fe6..98d3456 100644 (file)
--- 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.
         *