X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fobjectcache%2FObjectCache.php;h=87edc8bc2ed5a79b2bdf033c3ba75108a16f381d;hp=8ffe824f79ee874c28bf91745c702e202ee7dc1d;hb=9d5e3f56d55c81e68bace32dcfb039bc7e89c69d;hpb=b5fc03a7bfe46f434e332613c477e0ce9fe50e09

diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php
index 8ffe824f79..87edc8bc2e 100644
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -319,6 +319,7 @@ class ObjectCache {
 	 * @param array $params
 	 * @return WANObjectCache
 	 * @throws UnexpectedValueException
+	 * @suppress PhanTypeMismatchReturn
 	 */
 	public static function newWANCacheFromParams( array $params ) {
 		global $wgCommandLineMode, $wgSecretKey;
@@ -350,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.
 	 */