Merge "Use new WikiMap::getCurrentWikiDomain() for objectcache and profiler keyspace"

diff --combined includes/objectcache/ObjectCache.php
index ae42f80,cd3c642..cb6249c
--- 1/includes/objectcache/ObjectCache.php
--- 2/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@@ -154,7 -154,7 +154,7 @@@ class ObjectCache 
                        return $keyspace;
                }
  
-               return wfWikiID();
+               return WikiMap::getCurrentWikiDomain()->getId();
        }
  
        /**
@@@ -169,7 -169,11 +169,7 @@@
         * @throws InvalidArgumentException
         */
        public static function newFromParams( $params ) {
 -              if ( isset( $params['loggroup'] ) ) {
 -                      $params['logger'] = LoggerFactory::getInstance( $params['loggroup'] );
 -              } else {
 -                      $params['logger'] = LoggerFactory::getInstance( 'objectcache' );
 -              }
 +              $params['logger'] = LoggerFactory::getInstance( $params['loggroup'] ?? 'objectcache' );
                if ( !isset( $params['keyspace'] ) ) {
                        $params['keyspace'] = self::getDefaultKeyspace();
                }
@@@ -336,7 -340,11 +336,7 @@@
                        }
                }
                $params['cache'] = self::newFromParams( $params['store'] );
 -              if ( isset( $params['loggroup'] ) ) {
 -                      $params['logger'] = LoggerFactory::getInstance( $params['loggroup'] );
 -              } else {
 -                      $params['logger'] = LoggerFactory::getInstance( 'objectcache' );
 -              }
 +              $params['logger'] = LoggerFactory::getInstance( $params['loggroup'] ?? 'objectcache' );
                if ( !$wgCommandLineMode ) {
                        // Send the statsd data post-send on HTTP requests; avoid in CLI mode (T181385)
                        $params['stats'] = $services->getStatsdDataFactory();