From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 20 Aug 2019 13:40:26 +0000 (+0000)
Subject: Merge "objectcache: make newFromId()/newWANcacheFromId()/getDefaultKeyspace() private"
X-Git-Tag: 1.34.0-rc.0~667
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=609091451b61739e2f0cd938880d897e99477494;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "objectcache: make newFromId()/newWANcacheFromId()/getDefaultKeyspace() private"
---

609091451b61739e2f0cd938880d897e99477494
diff --combined includes/ServiceWiring.php
index bb6c2c26ef,0041f4257a..0b4ce4aa3a
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@@ -50,7 -50,6 +50,7 @@@ use MediaWiki\Linker\LinkRenderer
  use MediaWiki\Linker\LinkRendererFactory;
  use MediaWiki\Logger\LoggerFactory;
  use MediaWiki\MediaWikiServices;
 +use MediaWiki\Page\MovePageFactory;
  use MediaWiki\Permissions\PermissionManager;
  use MediaWiki\Preferences\PreferencesFactory;
  use MediaWiki\Preferences\DefaultPreferencesFactory;
@@@ -268,9 -267,10 +268,10 @@@ return 
  	},
  
  	'LocalServerObjectCache' => function ( MediaWikiServices $services ) : BagOStuff {
+ 		$config = $services->getMainConfig();
  		$cacheId = \ObjectCache::detectLocalServerCache();
  
- 		return \ObjectCache::newFromId( $cacheId );
+ 		return \ObjectCache::newFromParams( $config->get( 'ObjectCaches' )[$cacheId] );
  	},
  
  	'MagicWordFactory' => function ( MediaWikiServices $services ) : MagicWordFactory {
@@@ -320,20 -320,6 +321,20 @@@
  		);
  	},
  
 +	'MessageCache' => function ( MediaWikiServices $services ) : MessageCache {
 +		$mainConfig = $services->getMainConfig();
 +		return new MessageCache(
 +			$services->getMainWANObjectCache(),
 +			ObjectCache::getInstance( $mainConfig->get( 'MessageCacheType' ) ),
 +			$mainConfig->get( 'UseLocalMessageCache' )
 +				? $services->getLocalServerObjectCache()
 +				: new EmptyBagOStuff(),
 +			$mainConfig->get( 'UseDatabaseMessages' ),
 +			$mainConfig->get( 'MsgCacheExpiry' ),
 +			$services->getContentLanguage()
 +		);
 +	},
 +
  	'MimeAnalyzer' => function ( MediaWikiServices $services ) : MimeAnalyzer {
  		$logger = LoggerFactory::getInstance( 'Mime' );
  		$mainConfig = $services->getMainConfig();
@@@ -392,17 -378,6 +393,17 @@@
  		return new MimeAnalyzer( $params );
  	},
  
 +	'MovePageFactory' => function ( MediaWikiServices $services ) : MovePageFactory {
 +		return new MovePageFactory(
 +			new ServiceOptions( MovePageFactory::$constructorOptions, $services->getMainConfig() ),
 +			$services->getDBLoadBalancer(),
 +			$services->getNamespaceInfo(),
 +			$services->getWatchedItemStore(),
 +			$services->getPermissionManager(),
 +			$services->getRepoGroup()
 +		);
 +	},
 +
  	'NamespaceInfo' => function ( MediaWikiServices $services ) : NamespaceInfo {
  		return new NamespaceInfo( new ServiceOptions( NamespaceInfo::$constructorOptions,
  			$services->getMainConfig() ) );