Merge "ServiceWiring: Use RequestContext instead of $wgUser global"

diff --combined includes/ServiceWiring.php
index b1cdc81,3e03e86..e121898
--- 1/includes/ServiceWiring.php
--- 2/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@@ -149,10 -149,7 +149,10 @@@ return 
                $lbConf = MWLBFactory::applyDefaultConfig(
                        $mainConfig->get( 'LBFactoryConf' ),
                        $mainConfig,
 -                      $services->getConfiguredReadOnlyMode()
 +                      $services->getConfiguredReadOnlyMode(),
 +                      $services->getLocalServerObjectCache(),
 +                      $services->getMainObjectStash(),
 +                      $services->getMainWANObjectCache()
                );
                $class = MWLBFactory::getLBFactoryClass( $lbConf );
  
@@@ -203,12 -200,12 +203,12 @@@
        },
  
        'LinkRenderer' => function ( MediaWikiServices $services ) : LinkRenderer {
-               global $wgUser;
- 
                if ( defined( 'MW_NO_SESSION' ) ) {
                        return $services->getLinkRendererFactory()->create();
                } else {
-                       return $services->getLinkRendererFactory()->createForUser( $wgUser );
+                       return $services->getLinkRendererFactory()->createForUser(
+                               RequestContext::getMain()->getUser()
+                       );
                }
        },
  
@@@ -417,15 -414,10 +417,15 @@@
        },
  
        'ResourceLoader' => function ( MediaWikiServices $services ) : ResourceLoader {
 -              return new ResourceLoader(
 -                      $services->getMainConfig(),
 +              $config = $services->getMainConfig();
 +
 +              $rl = new ResourceLoader(
 +                      $config,
                        LoggerFactory::getInstance( 'resourceloader' )
                );
 +              $rl->addSource( $config->get( 'ResourceLoaderSources' ) );
 +
 +              return $rl;
        },
  
        'RevisionFactory' => function ( MediaWikiServices $services ) : RevisionFactory {
@@@ -497,10 -489,14 +497,10 @@@
        },
  
        'SiteLookup' => function ( MediaWikiServices $services ) : SiteLookup {
 -              $cacheFile = $services->getMainConfig()->get( 'SitesCacheFile' );
 -
 -              if ( $cacheFile !== false ) {
 -                      return new FileBasedSiteLookup( $cacheFile );
 -              } else {
 -                      // Use the default SiteStore as the SiteLookup implementation for now
 -                      return $services->getSiteStore();
 -              }
 +              // Use SiteStore as the SiteLookup as well. This was originally separated
 +              // to allow for a cacheable read-only interface (using FileBasedSiteLookup),
 +              // but this was never used. SiteStore has caching (see below).
 +              return $services->getSiteStore();
        },
  
        'SiteStore' => function ( MediaWikiServices $services ) : SiteStore {