From 9d5e3f56d55c81e68bace32dcfb039bc7e89c69d Mon Sep 17 00:00:00 2001 From: Zoranzoki21 Date: Sun, 15 Sep 2019 14:55:47 +0200 Subject: [PATCH 1/1] Remove getMainWANInstance and getMainStashInstance functions from ObjectCache as they were deprecated in 1.28 Change-Id: I133470a1c69c836f38b1ae5fecc05e50b70f4457 --- RELEASE-NOTES-1.34 | 2 ++ includes/objectcache/ObjectCache.php | 24 ------------------------ 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34 index 2da3b55e33..a99fd31990 100644 --- a/RELEASE-NOTES-1.34 +++ b/RELEASE-NOTES-1.34 @@ -430,6 +430,8 @@ because of Phabricator reports. * Revision::selectPageFields() * Revision::selectUserFields() * User::setNewpassword(), deprecated in 1.27 has been removed. +* The ObjectCache::getMainWANInstance and ObjectCache::getMainStashInstance + functions, deprecated since 1.28, have been removed. === Deprecations in 1.34 === * The MWNamespace class is deprecated. Use NamespaceInfo. diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php index 5e99ac9d70..87edc8bc2e 100644 --- a/includes/objectcache/ObjectCache.php +++ b/includes/objectcache/ObjectCache.php @@ -351,30 +351,6 @@ class ObjectCache { return self::getInstance( $wgMainCacheType ); } - /** - * Get the main WAN cache object. - * - * @since 1.26 - * @return WANObjectCache - * @deprecated Since 1.28 Use MediaWikiServices::getInstance()->getMainWANObjectCache() - */ - public static function getMainWANInstance() { - wfDeprecated( __METHOD__, '1.28' ); - return MediaWikiServices::getInstance()->getMainWANObjectCache(); - } - - /** - * Get the cache object for the main stash. - * - * @return BagOStuff - * @since 1.26 - * @deprecated Since 1.28 Use MediaWikiServices::getInstance()->getMainObjectStash() - */ - public static function getMainStashInstance() { - wfDeprecated( __METHOD__, '1.28' ); - return MediaWikiServices::getInstance()->getMainObjectStash(); - } - /** * Clear all the cached instances. */ -- 2.20.1