Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

objectcache: Deprecate ObjectCache::getWANInstance

Browse source 
This is not used anywhere. Once removed we can remove a bunch
more protected/private methods in this class that are all only
here still due to this one public method.

It was obsolete when the creation of WANObjectCache was
moved to ServiceWiring. In theory multiple instances can be
created but in the future that should be done by either constructing
the WANObjectCache directly where needed, or by implementing
it as a custom service.

Also deprecate ObjectCache::newWANCacheFromParams. This should
have been `@internal`, but oh well. Deprecate as well since
only needed by getWANInstance(). No longer used internally
either as of I118b6f01e4940.

Change-Id: Icc500e76c860c35ff40fdee47142c63091829dfe
This commit is contained in:
Timo Tijhof 2019-10-08 22:17:22 +01:00 committed by Aaron Schulz
parent e60d2394e0
commit b10b56dc69
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
RELEASE-NOTES-1.34
View file

@ -569,6 +569,10 @@ because of Phabricator reports.
* IDatabase::bufferResults() has been deprecated. Use query batching instead.
* MessageCache::singleton() is deprecated. Use
MediaWikiServices::getMessageCache().
* ObjectCache::getWANInstance() is deprecated. Use
MediaWikiServices::getMainWANObjectCache() instead.
* ObjectCache::newWANCacheFromParams() is deprecated. Use
MediaWikiServices::getMainWANObjectCache() instead.
* Constructing MovePage directly is deprecated. Use MovePageFactory.
* TempFSFile::factory() has been deprecated. Use TempFSFileFactory instead.
* wfIsBadImage() is deprecated. Use the BadFileLookup service instead.

5
includes/objectcache/ObjectCache.php
View file

@ -91,8 +91,10 @@ class ObjectCache {
* @since 1.26
* @param string $id A key in $wgWANObjectCaches.
* @return WANObjectCache
* @deprecated since 1.34 Use MediaWikiServices::getMainWANObjectCache instead
*/
public static function getWANInstance( $id ) {
wfDeprecated( __METHOD__, '1.34' );
if ( !isset( self::$wanInstances[$id] ) ) {
self::$wanInstances[$id] = self::newWANCacheFromId( $id );
}
@ -308,8 +310,11 @@ class ObjectCache {
* @return WANObjectCache
* @throws UnexpectedValueException
* @suppress PhanTypeMismatchReturn
* @deprecated since 1.34 Use MediaWikiServices::getMainWANObjectCache
* instead or use WANObjectCache::__construct directly
*/
public static function newWANCacheFromParams( array $params ) {
wfDeprecated( __METHOD__, '1.34' );
global $wgCommandLineMode, $wgSecretKey;
$services = MediaWikiServices::getInstance();