Merge "Map dummy language codes in sites"

diff --combined includes/ServiceWiring.php
index b076d07,e53b9ed..338f306
--- 1/includes/ServiceWiring.php
--- 2/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@@ -37,8 -37,6 +37,8 @@@
   *      MediaWiki code base.
   */
  
 +use MediaWiki\Interwiki\ClassicInterwikiLookup;
 +use MediaWiki\Linker\LinkRendererFactory;
  use MediaWiki\MediaWikiServices;
  
  return [
@@@ -61,6 -59,9 +61,9 @@@
  
        'SiteStore' => function( MediaWikiServices $services ) {
                $rawSiteStore = new DBSiteStore( $services->getDBLoadBalancer() );
+               $rawSiteStore->setLanguageCodeMapping(
+                       $services->getMainConfig()->get( 'DummyLanguageCodes' ) ?: []
+               );
  
                // TODO: replace wfGetCache with a CacheFactory service.
                // TODO: replace wfIsHHVM with a capabilities service.
@@@ -90,19 -91,6 +93,19 @@@
                return $services->getConfigFactory()->makeConfig( 'main' );
        },
  
 +      'InterwikiLookup' => function( MediaWikiServices $services ) {
 +              global $wgContLang; // TODO: manage $wgContLang as a service
 +              $config = $services->getMainConfig();
 +              return new ClassicInterwikiLookup(
 +                      $wgContLang,
 +                      ObjectCache::getMainWANInstance(),
 +                      $config->get( 'InterwikiExpiry' ),
 +                      $config->get( 'InterwikiCache' ),
 +                      $config->get( 'InterwikiScopes' ),
 +                      $config->get( 'InterwikiFallbackSite' )
 +              );
 +      },
 +
        'StatsdDataFactory' => function( MediaWikiServices $services ) {
                return new BufferingStatsdDataFactory(
                        rtrim( $services->getMainConfig()->get( 'StatsdMetricPrefix' ), '.' )
@@@ -160,22 -148,6 +163,22 @@@
                );
        },
  
 +      'LinkRendererFactory' => function( MediaWikiServices $services ) {
 +              return new LinkRendererFactory(
 +                      $services->getTitleFormatter()
 +              );
 +      },
 +
 +      'LinkRenderer' => function( MediaWikiServices $services ) {
 +              global $wgUser;
 +
 +              if ( defined( 'MW_NO_SESSION' ) ) {
 +                      return $services->getLinkRendererFactory()->create();
 +              } else {
 +                      return $services->getLinkRendererFactory()->createForUser( $wgUser );
 +              }
 +      },
 +
        'GenderCache' => function( MediaWikiServices $services ) {
                return new GenderCache();
        },