Merge "Split SiteLookup interface from SiteStore"

diff --combined autoload.php
index 6b83fcb,d4fe435..eacf431
--- 1/autoload.php
--- 2/autoload.php
+++ b/autoload.php
@@@ -1,6 -1,6 +1,6 @@@
  <?php
  // This file is generated by maintenance/generateLocalAutoload.php, do not adjust manually
 -
 +// @codingStandardsIgnoreFile
  global $wgAutoloadLocalClasses;
  
  $wgAutoloadLocalClasses = array(
@@@ -175,7 -175,6 +175,7 @@@
        'BloomFilterTitleHasLogs' => __DIR__ . '/includes/cache/bloom/BloomFilters.php',
        'BmpHandler' => __DIR__ . '/includes/media/BMP.php',
        'BrokenRedirectsPage' => __DIR__ . '/includes/specials/SpecialBrokenRedirects.php',
 +      'BufferingStatsdDataFactory' => __DIR__ . '/includes/libs/BufferingStatsdDataFactory.php',
        'CLDRPluralRuleConverter' => __DIR__ . '/languages/utils/CLDRPluralRuleConverter.php',
        'CLDRPluralRuleConverterExpression' => __DIR__ . '/languages/utils/CLDRPluralRuleConverterExpression.php',
        'CLDRPluralRuleConverterFragment' => __DIR__ . '/languages/utils/CLDRPluralRuleConverterFragment.php',
@@@ -189,6 -188,7 +189,7 @@@
        'CacheHelper' => __DIR__ . '/includes/cache/CacheHelper.php',
        'CacheTime' => __DIR__ . '/includes/parser/CacheTime.php',
        'CachedAction' => __DIR__ . '/includes/actions/CachedAction.php',
+       'CachingSiteStore' => __DIR__ . '/includes/site/CachingSiteStore.php',
        'CapsCleanup' => __DIR__ . '/maintenance/cleanupCaps.php',
        'Category' => __DIR__ . '/includes/Category.php',
        'CategoryFinder' => __DIR__ . '/includes/CategoryFinder.php',
@@@ -277,6 -277,7 +278,7 @@@
        'DBMasterPos' => __DIR__ . '/includes/db/DatabaseUtility.php',
        'DBObject' => __DIR__ . '/includes/db/DatabaseUtility.php',
        'DBQueryError' => __DIR__ . '/includes/db/DatabaseError.php',
+       'DBSiteStore' => __DIR__ . '/includes/site/DBSiteStore.php',
        'DBUnexpectedError' => __DIR__ . '/includes/db/DatabaseError.php',
        'DataUpdate' => __DIR__ . '/includes/deferred/DataUpdate.php',
        'DatabaseBase' => __DIR__ . '/includes/db/Database.php',
@@@ -290,6 -291,7 +292,6 @@@
        'DatabaseOracle' => __DIR__ . '/includes/db/DatabaseOracle.php',
        'DatabasePostgres' => __DIR__ . '/includes/db/DatabasePostgres.php',
        'DatabaseSqlite' => __DIR__ . '/includes/db/DatabaseSqlite.php',
 -      'DatabaseSqliteStandalone' => __DIR__ . '/includes/db/DatabaseSqlite.php',
        'DatabaseUpdater' => __DIR__ . '/includes/installer/DatabaseUpdater.php',
        'DateFormats' => __DIR__ . '/maintenance/language/date-formats.php',
        'DateFormatter' => __DIR__ . '/includes/parser/DateFormatter.php',
@@@ -417,6 -419,7 +419,7 @@@
        'FileBackendStoreShardDirIterator' => __DIR__ . '/includes/filebackend/FileBackendStore.php',
        'FileBackendStoreShardFileIterator' => __DIR__ . '/includes/filebackend/FileBackendStore.php',
        'FileBackendStoreShardListIterator' => __DIR__ . '/includes/filebackend/FileBackendStore.php',
+       'FileBasedSiteLookup' => __DIR__ . '/includes/site/FileBasedSiteLookup.php',
        'FileCacheBase' => __DIR__ . '/includes/cache/FileCacheBase.php',
        'FileDeleteForm' => __DIR__ . '/includes/FileDeleteForm.php',
        'FileDependency' => __DIR__ . '/includes/cache/CacheDependency.php',
@@@ -995,7 -998,6 +998,7 @@@
        'ResourceLoaderUserOptionsModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderUserOptionsModule.php',
        'ResourceLoaderUserTokensModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderUserTokensModule.php',
        'ResourceLoaderWikiModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderWikiModule.php',
 +      'RestbaseVirtualRESTService' => __DIR__ . '/includes/libs/virtualrest/RestbaseVirtualRESTService.php',
        'ResultWrapper' => __DIR__ . '/includes/db/DatabaseUtility.php',
        'RevDelArchiveItem' => __DIR__ . '/includes/revisiondelete/RevDelArchiveItem.php',
        'RevDelArchiveList' => __DIR__ . '/includes/revisiondelete/RevDelArchiveList.php',
@@@ -1061,14 -1063,14 +1064,14 @@@
        'SiteExporter' => __DIR__ . '/includes/site/SiteExporter.php',
        'SiteImporter' => __DIR__ . '/includes/site/SiteImporter.php',
        'SiteList' => __DIR__ . '/includes/site/SiteList.php',
-       'SiteListFileCache' => __DIR__ . '/includes/site/SiteListFileCache.php',
-       'SiteListFileCacheBuilder' => __DIR__ . '/includes/site/SiteListFileCacheBuilder.php',
+       'SiteLookup' => __DIR__ . '/includes/site/SiteLookup.php',
        'SiteObject' => __DIR__ . '/includes/site/Site.php',
        'SiteSQLStore' => __DIR__ . '/includes/site/SiteSQLStore.php',
        'SiteStats' => __DIR__ . '/includes/SiteStats.php',
        'SiteStatsInit' => __DIR__ . '/includes/SiteStats.php',
        'SiteStatsUpdate' => __DIR__ . '/includes/deferred/SiteStatsUpdate.php',
        'SiteStore' => __DIR__ . '/includes/site/SiteStore.php',
+       'SitesCacheFileBuilder' => __DIR__ . '/includes/site/SitesCacheFileBuilder.php',
        'Skin' => __DIR__ . '/includes/skins/Skin.php',
        'SkinApi' => __DIR__ . '/includes/skins/SkinApi.php',
        'SkinApiTemplate' => __DIR__ . '/includes/skins/SkinApiTemplate.php',
@@@ -1161,6 -1163,7 +1164,6 @@@
        'SquidPurgeClientPool' => __DIR__ . '/includes/SquidPurgeClient.php',
        'SquidUpdate' => __DIR__ . '/includes/deferred/SquidUpdate.php',
        'SrConverter' => __DIR__ . '/languages/classes/LanguageSr.php',
 -      'StatCounter' => __DIR__ . '/includes/StatCounter.php',
        'StatsOutput' => __DIR__ . '/maintenance/language/StatOutputs.php',
        'Status' => __DIR__ . '/includes/Status.php',
        'StatusValue' => __DIR__ . '/includes/libs/StatusValue.php',

diff --combined includes/DefaultSettings.php
index 80af4ae,e9262bc..64cfd17
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -257,23 -257,6 +257,23 @@@ $wgFileCacheDirectory = false
   */
  $wgLogo = false;
  
 +/**
 + * Array with URL paths to HD versions of the wiki logo. The scaled logo size
 + * should be under 135x155 pixels.
 + * Only 1.5x and 2x versions are supported.
 + *
 + * @par Example:
 + * @code
 + * $wgLogoHD = array(
 + *    "1.5x" => "path/to/1.5x_version.png",
 + *    "2x" => "path/to/2x_version.png"
 + * );
 + * @endcode
 + *
 + * @since 1.25
 + */
 +$wgLogoHD = false;
 +
  /**
   * The URL path of the shortcut icon.
   * @since 1.6
@@@ -3805,7 -3788,7 +3805,7 @@@ $wgInterwikiFallbackSite = 'wiki'
   */
  
  /**
-  * Specify the file location for the SiteStore json cache file.
+  * Specify the file location for the Sites json cache file.
   */
  $wgSitesCacheFile = false;
  
@@@ -6689,6 -6672,8 +6689,6 @@@ $wgLogActions = array
        'protect/modify' => 'modifiedarticleprotection',
        'protect/unprotect' => 'unprotectedarticle',
        'protect/move_prot' => 'movedarticleprotection',
 -      'import/upload' => 'import-logentry-upload',
 -      'import/interwiki' => 'import-logentry-interwiki',
  );
  
  /**
@@@ -6723,8 -6708,6 +6723,8 @@@ $wgLogActionsHandlers = array
        'block/reblock' => 'BlockLogFormatter',
        'suppress/block' => 'BlockLogFormatter',
        'suppress/reblock' => 'BlockLogFormatter',
 +      'import/upload' => 'LogFormatter',
 +      'import/interwiki' => 'LogFormatter',
  );
  
  /**
@@@ -7437,34 -7420,6 +7437,34 @@@ $wgPageLanguageUseDB = false
   */
  $wgUseLinkNamespaceDBFields = true;
  
 +/**
 + * Global configuration variable for Virtual REST Services.
 + * Parameters for different services are to be declared inside
 + * $wgVirtualRestConfig['modules'], which is to be treated as an associative
 + * array. Global parameters will be merged with service-specific ones. The
 + * result will then be passed to VirtualRESTService::__construct() in the
 + * module.
 + *
 + * Example config for Parsoid:
 + *
 + *   $wgVirtualRestConfig['modules']['parsoid'] = array(
 + *     'url' => 'http://localhost:8000',
 + *     'prefix' => 'enwiki',
 + *   );
 + *
 + * @var array
 + * @since 1.25
 + */
 +$wgVirtualRestConfig = array(
 +      'modules' => array(),
 +      'global' => array(
 +              # Timeout in seconds
 +              'timeout' => 360,
 +              'forwardCookies' => false,
 +              'HTTPProxy' => null
 +      )
 +);
 +
  /**
   * For really cool vim folding this needs to be at the end:
   * vim: foldmarker=@{,@} foldmethod=marker