ParamValidator: Flag as unstable for 1.34

[lhc/web/wiklou.git] / includes / ServiceWiring.php

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 6e31e86..e83f625 100644 (file)
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -262,7 +262,7 @@ return [
 
        'LanguageNameUtils' => function ( MediaWikiServices $services ) : LanguageNameUtils {
                return new LanguageNameUtils( new ServiceOptions(
-                       LanguageNameUtils::$constructorOptions,
+                       LanguageNameUtils::CONSTRUCTOR_OPTIONS,
                        $services->getMainConfig()
                ) );
        },
@@ -359,7 +359,15 @@ return [
                                "Cache type \"$id\" is not present in \$wgObjectCaches." );
                }
 
-               return ObjectCache::newFromParams( $mainConfig->get( 'ObjectCaches' )[$id] );
+               $params = $mainConfig->get( 'ObjectCaches' )[$id];
+               $logger = $params['logger'] = LoggerFactory::getInstance( $params['loggroup'] ?? 'objectcache' );
+
+               $store = ObjectCache::newFromParams( $params );
+               $logger->debug( 'MainObjectStash using store {class}', [
+                       'class' => get_class( $store )
+               ] );
+
+               return $store;
        },
 
        'MainWANObjectCache' => function ( MediaWikiServices $services ) : WANObjectCache {
@@ -411,12 +419,21 @@ return [
 
        'MessageCache' => function ( MediaWikiServices $services ) : MessageCache {
                $mainConfig = $services->getMainConfig();
+               $clusterCache = ObjectCache::getInstance( $mainConfig->get( 'MessageCacheType' ) );
+               $srvCache = $mainConfig->get( 'UseLocalMessageCache' )
+                       ? $services->getLocalServerObjectCache()
+                       : new EmptyBagOStuff();
+
+               // TODO: Inject this into MessageCache.
+               $logger = LoggerFactory::getInstance( 'MessageCache' );
+               $logger->debug( 'MessageCache using store {class}', [
+                       'class' => get_class( $clusterCache )
+               ] );
+
                return new MessageCache(
                        $services->getMainWANObjectCache(),
-                       ObjectCache::getInstance( $mainConfig->get( 'MessageCacheType' ) ),
-                       $mainConfig->get( 'UseLocalMessageCache' )
-                               ? $services->getLocalServerObjectCache()
-                               : new EmptyBagOStuff(),
+                       $clusterCache,
+                       $srvCache,
                        $mainConfig->get( 'UseDatabaseMessages' ),
                        $services->getContentLanguage()
                );