Merge "Inject LoadBalancer into GenderCache"

diff --combined includes/ServiceWiring.php
index 9073de1,e22d367..c192b5a
--- 1/includes/ServiceWiring.php
--- 2/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@@ -82,7 -82,6 +82,7 @@@ return 
        'BlobStoreFactory' => function ( MediaWikiServices $services ) : BlobStoreFactory {
                return new BlobStoreFactory(
                        $services->getDBLoadBalancerFactory(),
 +                      $services->getExternalStoreAccess(),
                        $services->getMainWANObjectCache(),
                        new ServiceOptions( BlobStoreFactory::$constructorOptions,
                                $services->getMainConfig() ),
@@@ -91,13 -90,19 +91,13 @@@
        },
  
        'BlockManager' => function ( MediaWikiServices $services ) : BlockManager {
 -              $config = $services->getMainConfig();
                $context = RequestContext::getMain();
                return new BlockManager(
 +                      new ServiceOptions(
 +                              BlockManager::$constructorOptions, $services->getMainConfig()
 +                      ),
                        $context->getUser(),
 -                      $context->getRequest(),
 -                      $config->get( 'ApplyIpBlocksToXff' ),
 -                      $config->get( 'CookieSetOnAutoblock' ),
 -                      $config->get( 'CookieSetOnIpBlock' ),
 -                      $config->get( 'DnsBlacklistUrls' ),
 -                      $config->get( 'EnableDnsBlacklist' ),
 -                      $config->get( 'ProxyList' ),
 -                      $config->get( 'ProxyWhitelist' ),
 -                      $config->get( 'SoftBlockRanges' )
 +                      $context->getRequest()
                );
        },
  
@@@ -195,27 -200,21 +195,32 @@@
                return new EventRelayerGroup( $services->getMainConfig()->get( 'EventRelayerConfig' ) );
        },
  
 +      'ExternalStoreAccess' => function ( MediaWikiServices $services ) : ExternalStoreAccess {
 +              return new ExternalStoreAccess(
 +                      $services->getExternalStoreFactory(),
 +                      LoggerFactory::getInstance( 'ExternalStore' )
 +              );
 +      },
 +
        'ExternalStoreFactory' => function ( MediaWikiServices $services ) : ExternalStoreFactory {
                $config = $services->getMainConfig();
 +              $writeStores = $config->get( 'DefaultExternalStore' );
  
                return new ExternalStoreFactory(
 -                      $config->get( 'ExternalStores' )
 +                      $config->get( 'ExternalStores' ),
 +                      ( $writeStores !== false ) ? (array)$writeStores : [],
 +                      $services->getDBLoadBalancer()->getLocalDomainID(),
 +                      LoggerFactory::getInstance( 'ExternalStore' )
                );
        },
  
        'GenderCache' => function ( MediaWikiServices $services ) : GenderCache {
-               return new GenderCache( $services->getNamespaceInfo() );
+               $nsInfo = $services->getNamespaceInfo();
+               // Database layer may be disabled, so processing without database connection
+               $dbLoadBalancer = $services->isServiceDisabled( 'DBLoadBalancer' )
+                       ? null
+                       : $services->getDBLoadBalancer();
+               return new GenderCache( $nsInfo, $dbLoadBalancer );
        },
  
        'HttpRequestFactory' =>
@@@ -263,7 -262,6 +268,7 @@@
  
        'LocalServerObjectCache' => function ( MediaWikiServices $services ) : BagOStuff {
                $cacheId = \ObjectCache::detectLocalServerCache();
 +
                return \ObjectCache::newFromId( $cacheId );
        },
  
@@@ -440,8 -438,7 +445,8 @@@
                        wfUrlProtocols(),
                        $services->getSpecialPageFactory(),
                        $services->getLinkRendererFactory(),
 -                      $services->getNamespaceInfo()
 +                      $services->getNamespaceInfo(),
 +                      LoggerFactory::getInstance( 'Parser' )
                );
        },
  
@@@ -467,14 -464,10 +472,14 @@@
                $config = $services->getMainConfig();
                return new PermissionManager(
                        $services->getSpecialPageFactory(),
 +                      $services->getRevisionLookup(),
                        $config->get( 'WhitelistRead' ),
                        $config->get( 'WhitelistReadRegexp' ),
                        $config->get( 'EmailConfirmToEdit' ),
                        $config->get( 'BlockDisablesLogin' ),
 +                      $config->get( 'GroupPermissions' ),
 +                      $config->get( 'RevokePermissions' ),
 +                      $config->get( 'AvailableRights' ),
                        $services->getNamespaceInfo()
                );
        },
@@@ -622,10 -615,9 +627,10 @@@
        'SiteStore' => function ( MediaWikiServices $services ) : SiteStore {
                $rawSiteStore = new DBSiteStore( $services->getDBLoadBalancer() );
  
 -              // TODO: replace wfGetCache with a CacheFactory service.
 -              // TODO: replace wfIsHHVM with a capabilities service.
 -              $cache = wfGetCache( wfIsHHVM() ? CACHE_ACCEL : CACHE_ANYTHING );
 +              $cache = $services->getLocalServerObjectCache();
 +              if ( $cache instanceof EmptyBagOStuff ) {
 +                      $cache = ObjectCache::getLocalClusterInstance();
 +              }
  
                return new CachingSiteStore( $rawSiteStore, $cache );
        },