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

diff --combined includes/ServiceWiring.php
index bb6c2c2,0041f42..0b4ce4a
--- 1/includes/ServiceWiring.php
--- 2/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() ) );