Merge "objectcache: Hard deprecate ObjectCache::getMainStashInstance()"

diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php
index c0adb51..e9853b1 100644 (file)
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -382,6 +382,7 @@ class ObjectCache {
         * @deprecated Since 1.28 Use MediaWikiServices::getInstance()->getMainObjectStash()
         */
        public static function getMainStashInstance() {
+               wfDeprecated( __METHOD__, '1.28' );
                return MediaWikiServices::getInstance()->getMainObjectStash();
        }