use MediaWiki\Http\HttpRequestFactory;
use MediaWiki\Interwiki\ClassicInterwikiLookup;
use MediaWiki\Interwiki\InterwikiLookup;
+use MediaWiki\Languages\LanguageNameUtils;
use MediaWiki\Linker\LinkRenderer;
use MediaWiki\Linker\LinkRendererFactory;
use MediaWiki\Logger\LoggerFactory;
$lbConf = MWLBFactory::applyDefaultConfig(
$mainConfig->get( 'LBFactoryConf' ),
- new ServiceOptions( MWLBFactory::$applyDefaultConfigOptions, $mainConfig ),
+ new ServiceOptions( MWLBFactory::APPLY_DEFAULT_CONFIG_OPTIONS, $mainConfig ),
$services->getConfiguredReadOnlyMode(),
$services->getLocalServerObjectCache(),
$services->getMainObjectStash(),
);
},
+ 'LanguageNameUtils' => function ( MediaWikiServices $services ) : LanguageNameUtils {
+ return new LanguageNameUtils( new ServiceOptions(
+ LanguageNameUtils::$constructorOptions,
+ $services->getMainConfig()
+ ) );
+ },
+
'LinkCache' => function ( MediaWikiServices $services ) : LinkCache {
return new LinkCache(
$services->getTitleFormatter(),
$logger,
[ function () use ( $services ) {
$services->getResourceLoader()->getMessageBlobStore()->clear();
- } ]
+ } ],
+ $services->getLanguageNameUtils()
);
},
}
$params = $mainConfig->get( 'WANObjectCaches' )[$id];
+
+ $logger = LoggerFactory::getInstance( $params['loggroup'] ?? 'objectcache' );
+
$objectCacheId = $params['cacheId'];
if ( !isset( $mainConfig->get( 'ObjectCaches' )[$objectCacheId] ) ) {
throw new UnexpectedValueException(
"Cache type \"$objectCacheId\" is not present in \$wgObjectCaches." );
}
- $params['store'] = $mainConfig->get( 'ObjectCaches' )[$objectCacheId];
+ $storeParams = $mainConfig->get( 'ObjectCaches' )[$objectCacheId];
+ $store = ObjectCache::newFromParams( $storeParams );
+ $logger->debug( 'MainWANObjectCache using store {class}', [
+ 'class' => get_class( $store )
+ ] );
+
+ $params['logger'] = $logger;
+ $params['cache'] = $store;
+ $params['secret'] = $params['secret'] ?? $mainConfig->get( 'SecretKey' );
+ if ( !$mainConfig->get( 'CommandLineMode' ) ) {
+ // Send the statsd data post-send on HTTP requests; avoid in CLI mode (T181385)
+ $params['stats'] = $services->getStatsdDataFactory();
+ // Let pre-emptive refreshes happen post-send on HTTP requests
+ $params['asyncHandler'] = [ DeferredUpdates::class, 'addCallableUpdate' ];
+ }
+
+ $class = $params['class'];
+ $instance = new $class( $params );
- return ObjectCache::newWANCacheFromParams( $params );
+ '@phan-var WANObjectCache $instance';
+ return $instance;
},
'MediaHandlerFactory' => function ( MediaWikiServices $services ) : MediaHandlerFactory {
'PreferencesFactory' => function ( MediaWikiServices $services ) : PreferencesFactory {
$factory = new DefaultPreferencesFactory(
new ServiceOptions(
- DefaultPreferencesFactory::$constructorOptions, $services->getMainConfig() ),
+ DefaultPreferencesFactory::CONSTRUCTOR_OPTIONS, $services->getMainConfig() ),
$services->getContentLanguage(),
AuthManager::singleton(),
$services->getLinkRendererFactory()->create(),