Reorg: Migrate WikiMap to WikiMap/ out of includes

And WikiReference

Bug: T321882
Change-Id: I60cf4b9ef02b9d58118caa39172677ddfe03d787

67 files changed, 90 insertions, 15 deletions

diff --git a/autoload.php b/autoload.php
index bc6c9cab4af9..fa0163540c49 100644
--- a/autoload.php
+++ b/autoload.php
@@ -2053,6 +2053,8 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Widget\\TitlesMultiselectWidget' => __DIR__ . '/includes/widget/TitlesMultiselectWidget.php',
 	'MediaWiki\\Widget\\UserInputWidget' => __DIR__ . '/includes/widget/UserInputWidget.php',
 	'MediaWiki\\Widget\\UsersMultiselectWidget' => __DIR__ . '/includes/widget/UsersMultiselectWidget.php',
+	'MediaWiki\\WikiMap\\WikiMap' => __DIR__ . '/includes/WikiMap/WikiMap.php',
+	'MediaWiki\\WikiMap\\WikiReference' => __DIR__ . '/includes/WikiMap/WikiReference.php',
 	'Mediawiki\\Page\\File\\FileDeleteForm' => __DIR__ . '/includes/page/File/FileDeleteForm.php',
 	'MediumSpecificBagOStuff' => __DIR__ . '/includes/libs/objectcache/MediumSpecificBagOStuff.php',
 	'MemcLockManager' => __DIR__ . '/includes/libs/lockmanager/MemcLockManager.php',
@@ -2721,9 +2723,9 @@ $wgAutoloadLocalClasses = [
 	'WikiFilePage' => __DIR__ . '/includes/page/WikiFilePage.php',
 	'WikiImporter' => __DIR__ . '/includes/import/WikiImporter.php',
 	'WikiImporterFactory' => __DIR__ . '/includes/import/WikiImporterFactory.php',
-	'WikiMap' => __DIR__ . '/includes/WikiMap.php',
+	'WikiMap' => __DIR__ . '/includes/WikiMap/WikiMap.php',
 	'WikiPage' => __DIR__ . '/includes/page/WikiPage.php',
-	'WikiReference' => __DIR__ . '/includes/WikiReference.php',
+	'WikiReference' => __DIR__ . '/includes/WikiMap/WikiReference.php',
 	'WikiRevision' => __DIR__ . '/includes/import/WikiRevision.php',
 	'WikiStatsOutput' => __DIR__ . '/maintenance/language/StatOutputs.php',
 	'WikiTextStructure' => __DIR__ . '/includes/content/WikiTextStructure.php',
diff --git a/includes/CommentFormatter/CommentParser.php b/includes/CommentFormatter/CommentParser.php
index a91d06f1042b..7ce16ffc5ab1 100644
--- a/includes/CommentFormatter/CommentParser.php
+++ b/includes/CommentFormatter/CommentParser.php
@@ -14,6 +14,7 @@ use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Linker\LinkTarget;
+use MediaWiki\WikiMap\WikiMap;
 use NamespaceInfo;
 use Parser;
 use RepoGroup;
@@ -296,7 +297,7 @@ class CommentParser {
 	) {
 		if ( $wikiId !== null && $wikiId !== false && !$target->isExternal() ) {
 			return Linker::makeExternalLink(
-				\WikiMap::getForeignURL(
+				WikiMap::getForeignURL(
 					$wikiId,
 					$target->getNamespace() === 0
 						? $target->getDBkey()
@@ -464,7 +465,7 @@ class CommentParser {
 		if ( $wikiId !== null && $wikiId !== false && !$target->isExternal() ) {
 			// Handle links from a foreign wiki ID
 			return Linker::makeExternalLink(
-				\WikiMap::getForeignURL(
+				WikiMap::getForeignURL(
 					$wikiId,
 					$target->getNamespace() === 0
 						? $target->getDBkey()
diff --git a/includes/DevelopmentSettings.php b/includes/DevelopmentSettings.php
index d0091fc970e1..4d6be036755a 100644
--- a/includes/DevelopmentSettings.php
+++ b/includes/DevelopmentSettings.php
@@ -30,6 +30,8 @@
  */
 
 // Enable showing of errors
+use MediaWiki\WikiMap\WikiMap;
+
 error_reporting( -1 );
 // @phan-suppress-next-line PhanTypeMismatchArgumentInternal Scalar okay with php8.1
 ini_set( 'display_errors', 1 );
diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index c3f22ad62a44..de3c23c53965 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -27,6 +27,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Permissions\PermissionStatus;
 use MediaWiki\Request\DerivativeRequest;
+use MediaWiki\WikiMap\WikiMap;
 use Psr\Log\LoggerInterface;
 use Wikimedia\AtEase\AtEase;
 use Wikimedia\Rdbms\ChronologyProtector;
diff --git a/includes/ResourceLoader/ResourceLoader.php b/includes/ResourceLoader/ResourceLoader.php
index f8b6a730b982..9aa2c3fb6db6 100644
--- a/includes/ResourceLoader/ResourceLoader.php
+++ b/includes/ResourceLoader/ResourceLoader.php
@@ -39,6 +39,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Request\HeaderCallback;
 use MediaWiki\User\UserOptionsLookup;
+use MediaWiki\WikiMap\WikiMap;
 use MWException;
 use MWExceptionHandler;
 use MWExceptionRenderer;
@@ -55,7 +56,6 @@ use Throwable;
 use Title;
 use UnexpectedValueException;
 use WebRequest;
-use WikiMap;
 use Wikimedia\DependencyStore\DependencyStore;
 use Wikimedia\DependencyStore\KeyValueDependencyStore;
 use Wikimedia\Minify\CSSMin;
diff --git a/includes/Rest/Handler/ParsoidHandler.php b/includes/Rest/Handler/ParsoidHandler.php
index f083c87706c9..8a6f98540279 100644
--- a/includes/Rest/Handler/ParsoidHandler.php
+++ b/includes/Rest/Handler/ParsoidHandler.php
@@ -42,10 +42,10 @@ use MediaWiki\Rest\ResponseException;
 use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RevisionAccessException;
 use MediaWiki\Revision\SlotRecord;
+use MediaWiki\WikiMap\WikiMap;
 use MobileContext;
 use RequestContext;
 use Title;
-use WikiMap;
 use Wikimedia\Http\HttpAcceptParser;
 use Wikimedia\Message\DataMessageValue;
 use Wikimedia\Parsoid\Config\DataAccess;
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index cf468809a651..ca8e304b29c6 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -193,6 +193,7 @@ use MediaWiki\User\UserOptionsLookup;
 use MediaWiki\User\UserOptionsManager;
 use MediaWiki\Utils\UrlUtils;
 use MediaWiki\Watchlist\WatchlistManager;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\DependencyStore\KeyValueDependencyStore;
 use Wikimedia\DependencyStore\SqlModuleDependencyStore;
 use Wikimedia\Message\IMessageFormatterFactory;
diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index 2a8df037151b..88d22f152de4 100644
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -19,6 +19,7 @@
  */
 
 use MediaWiki\Shell\Shell;
+use MediaWiki\WikiMap\WikiMap;
 
 /**
  * Configuration holder, particularly for multi-wiki sites.
diff --git a/includes/WikiMap.php b/includes/WikiMap/WikiMap.php
index d24507d7abc6..71a2ec6862ba 100644
--- a/includes/WikiMap.php
+++ b/includes/WikiMap/WikiMap.php
@@ -20,8 +20,11 @@
  * @file
  */
 
+namespace MediaWiki\WikiMap;
+
 use MediaWiki\Linker\Linker;
 use MediaWiki\MediaWikiServices;
+use MediaWikiSite;
 use Wikimedia\Rdbms\DatabaseDomain;
 
 /**
@@ -319,3 +322,5 @@ class WikiMap {
 		return ( self::getCurrentWikiId() === $wikiId );
 	}
 }
+
+class_alias( WikiMap::class, 'WikiMap' );
diff --git a/includes/WikiReference.php b/includes/WikiMap/WikiReference.php
index eeede1b0a0e7..8e86dc9f4001 100644
--- a/includes/WikiReference.php
+++ b/includes/WikiMap/WikiReference.php
@@ -20,6 +20,8 @@
  * @file
  */
 
+namespace MediaWiki\WikiMap;
+
 /**
  * Reference to a locally-hosted wiki
  */
@@ -118,7 +120,8 @@ class WikiReference {
 	 * @return string URL
 	 */
 	public function getFullUrl( $page, $fragmentId = null ) {
-		return $this->mServer .
-			$this->getLocalUrl( $page, $fragmentId );
+		return $this->mServer . $this->getLocalUrl( $page, $fragmentId );
 	}
 }
+
+class_alias( WikiReference::class, 'WikiReference' );
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index f1843f14b2ee..d7d91371250e 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -34,6 +34,7 @@ use MediaWiki\Rest\HeaderParser\Origin;
 use MediaWiki\Session\SessionManager;
 use MediaWiki\StubObject\StubGlobalUser;
 use MediaWiki\User\UserRigorOptions;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\AtEase\AtEase;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\Timestamp\TimestampException;
diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index 125585e8e5d1..c7b1918e258d 100644
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -35,6 +35,7 @@ use MediaWiki\Request\FauxRequest;
 use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\ParamValidator\TypeDef\EnumDef;
 
diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index 7790b2e85436..166950584fa2 100644
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -32,6 +32,7 @@ use MediaWiki\ResourceLoader\SkinModule;
 use MediaWiki\SpecialPage\SpecialPageFactory;
 use MediaWiki\User\UserGroupManager;
 use MediaWiki\User\UserOptionsLookup;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\Rdbms\ILoadBalancer;
 
diff --git a/includes/debug/logger/LegacyLogger.php b/includes/debug/logger/LegacyLogger.php
index 8acc2ec30240..00a2f5aebb1d 100644
--- a/includes/debug/logger/LegacyLogger.php
+++ b/includes/debug/logger/LegacyLogger.php
@@ -22,6 +22,7 @@ namespace MediaWiki\Logger;
 
 use DateTimeZone;
 use Error;
+use MediaWiki\WikiMap\WikiMap;
 use MWDebug;
 use MWExceptionHandler;
 use Psr\Log\AbstractLogger;
@@ -29,7 +30,6 @@ use Psr\Log\LogLevel;
 use RuntimeException;
 use Throwable;
 use UDPTransport;
-use WikiMap;
 use Wikimedia\AtEase\AtEase;
 
 /**
diff --git a/includes/debug/logger/monolog/WikiProcessor.php b/includes/debug/logger/monolog/WikiProcessor.php
index 3ec7a0b85384..3dad04baf7d4 100644
--- a/includes/debug/logger/monolog/WikiProcessor.php
+++ b/includes/debug/logger/monolog/WikiProcessor.php
@@ -20,7 +20,7 @@
 
 namespace MediaWiki\Logger\Monolog;
 
-use WikiMap;
+use MediaWiki\WikiMap\WikiMap;
 
 /**
  * Annotate log records with request-global metadata, such as the hostname,
diff --git a/includes/externalstore/ExternalStoreMwstore.php b/includes/externalstore/ExternalStoreMwstore.php
index f0a15bf87d6a..d9b5f36aaf64 100644
--- a/includes/externalstore/ExternalStoreMwstore.php
+++ b/includes/externalstore/ExternalStoreMwstore.php
@@ -18,6 +18,8 @@
  * @file
  */
 
+use MediaWiki\WikiMap\WikiMap;
+
 /**
  * External storage in a FileBackend.
  *
diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php
index 8119771f6a02..bb6090515b8e 100644
--- a/includes/filerepo/LocalRepo.php
+++ b/includes/filerepo/LocalRepo.php
@@ -23,6 +23,7 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Storage\BlobStore;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IResultWrapper;
diff --git a/includes/interwiki/ClassicInterwikiLookup.php b/includes/interwiki/ClassicInterwikiLookup.php
index db5fcb6d97fd..e60e31cfbbaa 100644
--- a/includes/interwiki/ClassicInterwikiLookup.php
+++ b/includes/interwiki/ClassicInterwikiLookup.php
@@ -27,8 +27,8 @@ use MediaWiki\Config\ServiceOptions;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\MainConfigNames;
+use MediaWiki\WikiMap\WikiMap;
 use WANObjectCache;
-use WikiMap;
 use Wikimedia\Rdbms\ILoadBalancer;
 
 /**
diff --git a/includes/jobqueue/JobQueue.php b/includes/jobqueue/JobQueue.php
index 322dd16cf638..4e75129d8309 100644
--- a/includes/jobqueue/JobQueue.php
+++ b/includes/jobqueue/JobQueue.php
@@ -23,6 +23,7 @@
 use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
 use MediaWiki\JobQueue\JobFactory;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\RequestTimeout\TimeoutException;
 use Wikimedia\UUID\GlobalIdGenerator;
 
diff --git a/includes/jobqueue/JobQueueGroup.php b/includes/jobqueue/JobQueueGroup.php
index af7e0dde6e1f..ab372c0b9a14 100644
--- a/includes/jobqueue/JobQueueGroup.php
+++ b/includes/jobqueue/JobQueueGroup.php
@@ -21,6 +21,7 @@
  */
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\UUID\GlobalIdGenerator;
 
 /**
diff --git a/includes/jobqueue/JobQueueGroupFactory.php b/includes/jobqueue/JobQueueGroupFactory.php
index 470e8b1a7632..7ef6e0cf54e4 100644
--- a/includes/jobqueue/JobQueueGroupFactory.php
+++ b/includes/jobqueue/JobQueueGroupFactory.php
@@ -25,8 +25,8 @@ use IBufferingStatsdDataFactory;
 use JobQueueGroup;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\MainConfigNames;
+use MediaWiki\WikiMap\WikiMap;
 use WANObjectCache;
-use WikiMap;
 use Wikimedia\UUID\GlobalIdGenerator;
 
 /**
diff --git a/includes/jobqueue/JobQueueRedis.php b/includes/jobqueue/JobQueueRedis.php
index 2ba555a5116a..46c4d03680a2 100644
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@ -21,6 +21,7 @@
  */
 
 use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\WikiMap\WikiMap;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/includes/logging/RightsLogFormatter.php b/includes/logging/RightsLogFormatter.php
index 927d24ced31c..eeed5493afd8 100644
--- a/includes/logging/RightsLogFormatter.php
+++ b/includes/logging/RightsLogFormatter.php
@@ -25,6 +25,7 @@
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\WikiMap\WikiMap;
 
 /**
  * This class formats rights log entries.
diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php
index 701129b1b7af..c6f34ff72b88 100644
--- a/includes/mail/UserMailer.php
+++ b/includes/mail/UserMailer.php
@@ -27,6 +27,7 @@
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\WikiMap\WikiMap;
 
 /**
  * Collection of static functions for sending mail
diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php
index 288293ea9aed..177235ec6154 100644
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -24,6 +24,7 @@
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\WikiMap\WikiMap;
 
 /**
  * Functions to get cache objects
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 10ec8e775755..6f41807a9f36 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -50,6 +50,7 @@ use MediaWiki\Title\TitleArray;
 use MediaWiki\User\ActorMigration;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\Assert\Assert;
 use Wikimedia\Assert\PreconditionException;
 use Wikimedia\NonSerializable\NonSerializableTrait;
diff --git a/includes/parser/Parsoid/Config/SiteConfig.php b/includes/parser/Parsoid/Config/SiteConfig.php
index 742c81df2b24..587eb31fde65 100644
--- a/includes/parser/Parsoid/Config/SiteConfig.php
+++ b/includes/parser/Parsoid/Config/SiteConfig.php
@@ -39,6 +39,7 @@ use MediaWiki\Parser\MagicWordFactory;
 use MediaWiki\SpecialPage\SpecialPageFactory;
 use MediaWiki\User\UserOptionsLookup;
 use MediaWiki\Utils\UrlUtils;
+use MediaWiki\WikiMap\WikiMap;
 use MutableConfig;
 use MWException;
 use NamespaceInfo;
@@ -48,7 +49,6 @@ use PrefixingStatsdDataFactoryProxy;
 use Psr\Log\LoggerInterface;
 use Title;
 use UnexpectedValueException;
-use WikiMap;
 use Wikimedia\ObjectFactory\ObjectFactory;
 use Wikimedia\Parsoid\Config\SiteConfig as ISiteConfig;
 use Wikimedia\Parsoid\Core\ContentMetadataCollector;
diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index d6e780075790..9958720406e1 100644
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -19,6 +19,7 @@
  */
 
 use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\WikiMap\WikiMap;
 use Psr\Log\LoggerInterface;
 use Wikimedia\Rdbms\TransactionProfiler;
 use Wikimedia\ScopedCallback;
diff --git a/includes/rcfeed/MachineReadableRCFeedFormatter.php b/includes/rcfeed/MachineReadableRCFeedFormatter.php
index 588149e0b34d..5652931a3bdb 100644
--- a/includes/rcfeed/MachineReadableRCFeedFormatter.php
+++ b/includes/rcfeed/MachineReadableRCFeedFormatter.php
@@ -21,6 +21,7 @@
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\WikiMap\WikiMap;
 
 /**
  * Abstract class so there can be multiple formatters outputting the same data
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 0e6fdc367505..d8264c96ee5b 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -36,6 +36,7 @@ use MediaWiki\Skin\SkinComponentRegistry;
 use MediaWiki\Skin\SkinComponentRegistryContext;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\WrappedStringList;
 
 /**
diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index a937bf60b011..871e1511dd6f 100644
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -32,6 +32,7 @@ use MediaWiki\User\UserGroupManagerFactory;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserNamePrefixSearch;
 use MediaWiki\User\UserNameUtils;
+use MediaWiki\WikiMap\WikiMap;
 
 /**
  * Special page to allow managing user group membership
diff --git a/includes/user/CentralId/LocalIdLookup.php b/includes/user/CentralId/LocalIdLookup.php
index ea15b4ce05d6..f1eeb2d6775d 100644
--- a/includes/user/CentralId/LocalIdLookup.php
+++ b/includes/user/CentralId/LocalIdLookup.php
@@ -22,6 +22,7 @@
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\User\UserIdentity;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\Rdbms\ILoadBalancer;
 
 /**
diff --git a/includes/user/UserGroupManager.php b/includes/user/UserGroupManager.php
index 04281c72fa10..587417f9befd 100644
--- a/includes/user/UserGroupManager.php
+++ b/includes/user/UserGroupManager.php
@@ -34,13 +34,13 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Permissions\GroupPermissionsLookup;
 use MediaWiki\User\TempUser\TempUserConfig;
+use MediaWiki\WikiMap\WikiMap;
 use Psr\Log\LoggerInterface;
 use ReadOnlyMode;
 use Sanitizer;
 use User;
 use UserGroupExpiryJob;
 use UserGroupMembership;
-use WikiMap;
 use Wikimedia\Assert\Assert;
 use Wikimedia\IPUtils;
 use Wikimedia\Rdbms\DBConnRef;
diff --git a/includes/user/UserRightsProxy.php b/includes/user/UserRightsProxy.php
index 1572fcd3d0c8..efb6ad598fc0 100644
--- a/includes/user/UserRightsProxy.php
+++ b/includes/user/UserRightsProxy.php
@@ -25,6 +25,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\User\UserGroupManager;
 use MediaWiki\User\UserIdentity;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\Rdbms\IDatabase;
 
 /**
diff --git a/maintenance/TableCleanup.php b/maintenance/TableCleanup.php
index 9a686c47c6cd..92f59b10b472 100644
--- a/maintenance/TableCleanup.php
+++ b/maintenance/TableCleanup.php
@@ -21,6 +21,8 @@
  * @ingroup Maintenance
  */
 
+use MediaWiki\WikiMap\WikiMap;
+
 require_once __DIR__ . '/Maintenance.php';
 
 /**
diff --git a/maintenance/cleanupInvalidDbKeys.php b/maintenance/cleanupInvalidDbKeys.php
index 199798abe881..ea341df8026f 100644
--- a/maintenance/cleanupInvalidDbKeys.php
+++ b/maintenance/cleanupInvalidDbKeys.php
@@ -24,6 +24,7 @@
 require_once __DIR__ . '/Maintenance.php';
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\WikiMap\WikiMap;
 
 /**
  * Maintenance script that cleans up invalid titles in various tables.
diff --git a/maintenance/copyJobQueue.php b/maintenance/copyJobQueue.php
index 2aa4bf0fd801..ca99f6b12642 100644
--- a/maintenance/copyJobQueue.php
+++ b/maintenance/copyJobQueue.php
@@ -22,6 +22,7 @@
  */
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\WikiMap\WikiMap;
 
 require_once __DIR__ . '/Maintenance.php';
 
diff --git a/maintenance/createAndPromote.php b/maintenance/createAndPromote.php
index 7c8cc9d799e7..e2eecf3e9ae1 100644
--- a/maintenance/createAndPromote.php
+++ b/maintenance/createAndPromote.php
@@ -26,6 +26,7 @@
 require_once __DIR__ . '/Maintenance.php';
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\WikiMap\WikiMap;
 
 /**
  * Maintenance script to create an account and grant it rights.
diff --git a/maintenance/generateSitemap.php b/maintenance/generateSitemap.php
index 92edeaae17df..b6f51e0fb939 100644
--- a/maintenance/generateSitemap.php
+++ b/maintenance/generateSitemap.php
@@ -28,6 +28,7 @@
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IResultWrapper;
 
diff --git a/maintenance/grep.php b/maintenance/grep.php
index 5b50d932efcf..3b86541bffee 100644
--- a/maintenance/grep.php
+++ b/maintenance/grep.php
@@ -3,6 +3,7 @@
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\WikiPageFactory;
 use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\WikiMap\WikiMap;
 
 require_once __DIR__ . '/Maintenance.php';
 
diff --git a/maintenance/includes/BackupDumper.php b/maintenance/includes/BackupDumper.php
index a74832ea3a35..33dd161791a9 100644
--- a/maintenance/includes/BackupDumper.php
+++ b/maintenance/includes/BackupDumper.php
@@ -31,6 +31,7 @@ require_once __DIR__ . '/../../includes/export/WikiExporter.php';
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Settings\SettingsBuilder;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\Rdbms\IMaintainableDatabase;
 use Wikimedia\Rdbms\LoadBalancer;
 
diff --git a/maintenance/includes/TextPassDumper.php b/maintenance/includes/TextPassDumper.php
index 6ac2d79fa992..2bf6368da755 100644
--- a/maintenance/includes/TextPassDumper.php
+++ b/maintenance/includes/TextPassDumper.php
@@ -35,6 +35,7 @@ use MediaWiki\Shell\Shell;
 use MediaWiki\Storage\BlobAccessException;
 use MediaWiki\Storage\BlobStore;
 use MediaWiki\Storage\SqlBlobStore;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\AtEase\AtEase;
 use Wikimedia\Rdbms\IMaintainableDatabase;
 
diff --git a/maintenance/initEditCount.php b/maintenance/initEditCount.php
index 02f1c75e20ff..73b5f694b07c 100644
--- a/maintenance/initEditCount.php
+++ b/maintenance/initEditCount.php
@@ -26,6 +26,7 @@ require_once __DIR__ . '/Maintenance.php';
 
 use MediaWiki\MediaWikiServices;
 use MediaWiki\User\ActorMigration;
+use MediaWiki\WikiMap\WikiMap;
 
 class InitEditCount extends Maintenance {
 	public function __construct() {
diff --git a/maintenance/storage/recompressTracked.php b/maintenance/storage/recompressTracked.php
index 985e5aabb1c8..a7447036b0ed 100644
--- a/maintenance/storage/recompressTracked.php
+++ b/maintenance/storage/recompressTracked.php
@@ -26,6 +26,7 @@ use MediaWiki\Logger\LegacyLogger;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Shell\Shell;
 use MediaWiki\Storage\SqlBlobStore;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\AtEase\AtEase;
 
 $optionsWithArgs = RecompressTracked::getOptionsWithArgs();
diff --git a/maintenance/update.php b/maintenance/update.php
index bbbb66981098..f1f10af6560c 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -31,6 +31,7 @@ require_once __DIR__ . '/Maintenance.php';
 
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Settings\SettingsBuilder;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\Rdbms\DatabaseSqlite;
 
 /**
diff --git a/maintenance/updateSearchIndex.php b/maintenance/updateSearchIndex.php
index bdd9c40f3c98..3157b75bbdee 100644
--- a/maintenance/updateSearchIndex.php
+++ b/maintenance/updateSearchIndex.php
@@ -30,6 +30,7 @@
 
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Revision\SlotRecord;
+use MediaWiki\WikiMap\WikiMap;
 
 require_once __DIR__ . '/Maintenance.php';
 
diff --git a/maintenance/uppercaseTitlesForUnicodeTransition.php b/maintenance/uppercaseTitlesForUnicodeTransition.php
index eab3ad3544ab..2d142de8e800 100644
--- a/maintenance/uppercaseTitlesForUnicodeTransition.php
+++ b/maintenance/uppercaseTitlesForUnicodeTransition.php
@@ -23,6 +23,7 @@
  */
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\Rdbms\IDatabase;
 
 require_once __DIR__ . '/Maintenance.php';
diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php
index 3610abb9ea9a..d0d9c0fcbfdc 100644
--- a/tests/parser/ParserTestRunner.php
+++ b/tests/parser/ParserTestRunner.php
@@ -35,6 +35,7 @@ use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\StubObject\StubGlobalUser;
+use MediaWiki\WikiMap\WikiMap;
 use Psr\Log\NullLogger;
 use Wikimedia\Assert\Assert;
 use Wikimedia\Parsoid\Config\PageConfig;
diff --git a/tests/phpunit/includes/ResourceLoader/WikiModuleTest.php b/tests/phpunit/includes/ResourceLoader/WikiModuleTest.php
index bd2ae4ab8c27..35cfea00ea39 100644
--- a/tests/phpunit/includes/ResourceLoader/WikiModuleTest.php
+++ b/tests/phpunit/includes/ResourceLoader/WikiModuleTest.php
@@ -18,11 +18,11 @@ use MediaWiki\Request\FauxRequest;
 use MediaWiki\ResourceLoader\Context;
 use MediaWiki\ResourceLoader\DerivativeContext;
 use MediaWiki\ResourceLoader\WikiModule;
+use MediaWiki\WikiMap\WikiMap;
 use ReflectionMethod;
 use ResourceLoaderTestCase;
 use Title;
 use TitleValue;
-use WikiMap;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\TestingAccessWrapper;
 use WikitextContent;
diff --git a/tests/phpunit/includes/WikiMapTest.php b/tests/phpunit/includes/WikiMapTest.php
index 19fd7b479bb2..82af00992d49 100644
--- a/tests/phpunit/includes/WikiMapTest.php
+++ b/tests/phpunit/includes/WikiMapTest.php
@@ -1,6 +1,8 @@
 <?php
 
 use MediaWiki\MainConfigNames;
+use MediaWiki\WikiMap\WikiMap;
+use MediaWiki\WikiMap\WikiReference;
 use Wikimedia\Rdbms\DatabaseDomain;
 
 /**
diff --git a/tests/phpunit/includes/api/ApiUploadTest.php b/tests/phpunit/includes/api/ApiUploadTest.php
index b4d33ebd15af..a6d8260d9f51 100644
--- a/tests/phpunit/includes/api/ApiUploadTest.php
+++ b/tests/phpunit/includes/api/ApiUploadTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\MainConfigNames;
+use MediaWiki\WikiMap\WikiMap;
 
 /**
  * @group API
diff --git a/tests/phpunit/includes/db/LBFactoryTest.php b/tests/phpunit/includes/db/LBFactoryTest.php
index 93bfdd1bbf84..de6184934497 100644
--- a/tests/phpunit/includes/db/LBFactoryTest.php
+++ b/tests/phpunit/includes/db/LBFactoryTest.php
@@ -23,6 +23,7 @@
  * @copyright © 2013 Wikimedia Foundation Inc.
  */
 
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\Rdbms\ChronologyProtector;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\DatabaseDomain;
diff --git a/tests/phpunit/includes/filebackend/FileBackendGroupIntegrationTest.php b/tests/phpunit/includes/filebackend/FileBackendGroupIntegrationTest.php
index 16062f394bd3..7e63fbb28524 100644
--- a/tests/phpunit/includes/filebackend/FileBackendGroupIntegrationTest.php
+++ b/tests/phpunit/includes/filebackend/FileBackendGroupIntegrationTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\FileBackend\LockManager\LockManagerGroupFactory;
 use MediaWiki\MainConfigNames;
+use MediaWiki\WikiMap\WikiMap;
 
 /**
  * @coversDefaultClass FileBackendGroup
diff --git a/tests/phpunit/includes/filebackend/FileBackendIntegrationTest.php b/tests/phpunit/includes/filebackend/FileBackendIntegrationTest.php
index 76878ae4af33..2f3f0e227539 100644
--- a/tests/phpunit/includes/filebackend/FileBackendIntegrationTest.php
+++ b/tests/phpunit/includes/filebackend/FileBackendIntegrationTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/includes/filebackend/lockmanager/LockManagerGroupIntegrationTest.php b/tests/phpunit/includes/filebackend/lockmanager/LockManagerGroupIntegrationTest.php
index a18e339b6554..42905a5ea657 100644
--- a/tests/phpunit/includes/filebackend/lockmanager/LockManagerGroupIntegrationTest.php
+++ b/tests/phpunit/includes/filebackend/lockmanager/LockManagerGroupIntegrationTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\MainConfigNames;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\Rdbms\LBFactory;
 
diff --git a/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php b/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php
index 329c89c1785f..e33f34366095 100644
--- a/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php
+++ b/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\WikiMap\WikiMap;
+
 class FileBackendDBRepoWrapperTest extends MediaWikiIntegrationTestCase {
 	protected $backendName = 'foo-backend';
 	protected $repoName = 'pureTestRepo';
diff --git a/tests/phpunit/includes/filerepo/LocalRepoTest.php b/tests/phpunit/includes/filerepo/LocalRepoTest.php
index af273cd8ed1e..c57957e6ae64 100644
--- a/tests/phpunit/includes/filerepo/LocalRepoTest.php
+++ b/tests/phpunit/includes/filerepo/LocalRepoTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\MainConfigNames;
+use MediaWiki\WikiMap\WikiMap;
 
 /**
  * @coversDefaultClass LocalRepo
diff --git a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
index 139b3c9dd12f..52a8a469fa4b 100644
--- a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
+++ b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\Rdbms\FakeResultWrapper;
 
 /**
diff --git a/tests/phpunit/includes/filerepo/StoreBatchTest.php b/tests/phpunit/includes/filerepo/StoreBatchTest.php
index 0e1ae741a70d..9caba694414f 100644
--- a/tests/phpunit/includes/filerepo/StoreBatchTest.php
+++ b/tests/phpunit/includes/filerepo/StoreBatchTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\WikiMap\WikiMap;
+
 /**
  * @group FileRepo
  * @group medium
diff --git a/tests/phpunit/includes/filerepo/file/FileTest.php b/tests/phpunit/includes/filerepo/file/FileTest.php
index ca1daf26155c..d33b05abd385 100644
--- a/tests/phpunit/includes/filerepo/file/FileTest.php
+++ b/tests/phpunit/includes/filerepo/file/FileTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageIdentityValue;
+use MediaWiki\WikiMap\WikiMap;
 
 class FileTest extends MediaWikiMediaTestCase {
 
diff --git a/tests/phpunit/includes/filerepo/file/LocalFileTest.php b/tests/phpunit/includes/filerepo/file/LocalFileTest.php
index 3dc44dd4a0d5..10cb9d661869 100644
--- a/tests/phpunit/includes/filerepo/file/LocalFileTest.php
+++ b/tests/phpunit/includes/filerepo/file/LocalFileTest.php
@@ -10,6 +10,7 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 use MediaWiki\User\UserIdentity;
+use MediaWiki\WikiMap\WikiMap;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/includes/interwiki/ClassicInterwikiLookupTest.php b/tests/phpunit/includes/interwiki/ClassicInterwikiLookupTest.php
index 007f31f6ede2..aa93b86a046a 100644
--- a/tests/phpunit/includes/interwiki/ClassicInterwikiLookupTest.php
+++ b/tests/phpunit/includes/interwiki/ClassicInterwikiLookupTest.php
@@ -3,6 +3,7 @@
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Interwiki\ClassicInterwikiLookup;
 use MediaWiki\MainConfigNames;
+use MediaWiki\WikiMap\WikiMap;
 
 /**
  * @covers MediaWiki\Interwiki\ClassicInterwikiLookup
diff --git a/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php b/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php
index bc19751ca561..0139fb60f39d 100644
--- a/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php
+++ b/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\WikiMap\WikiMap;
 
 /**
  * @covers JobQueueMemory
diff --git a/tests/phpunit/includes/jobqueue/JobQueueTest.php b/tests/phpunit/includes/jobqueue/JobQueueTest.php
index 9c0f117615f9..85e15e733ef5 100644
--- a/tests/phpunit/includes/jobqueue/JobQueueTest.php
+++ b/tests/phpunit/includes/jobqueue/JobQueueTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\WikiMap\WikiMap;
 
 /**
  * @group JobQueue
diff --git a/tests/phpunit/includes/media/MediaWikiMediaTestCase.php b/tests/phpunit/includes/media/MediaWikiMediaTestCase.php
index 9c468e269d86..c81d94855220 100644
--- a/tests/phpunit/includes/media/MediaWikiMediaTestCase.php
+++ b/tests/phpunit/includes/media/MediaWikiMediaTestCase.php
@@ -1,4 +1,7 @@
 <?php
+
+use MediaWiki\WikiMap\WikiMap;
+
 /**
  * Specificly for testing Media handlers. Sets up a FileRepo backend
  */
diff --git a/tests/phpunit/integration/includes/filerepo/LocalAndForeignDBRepoTest.php b/tests/phpunit/integration/includes/filerepo/LocalAndForeignDBRepoTest.php
index e6bb889a7899..cb582712b971 100644
--- a/tests/phpunit/integration/includes/filerepo/LocalAndForeignDBRepoTest.php
+++ b/tests/phpunit/integration/includes/filerepo/LocalAndForeignDBRepoTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\WikiMap\WikiMap;
+
 class LocalAndForeignDBRepoTest extends MediaWikiIntegrationTestCase {
 	/**
 	 * @covers LocalRepo::getSharedCacheKey
diff --git a/tests/phpunit/unit/includes/WikiReferenceTest.php b/tests/phpunit/unit/includes/WikiReferenceTest.php
index a4aae86c0f0c..c06c1de8616c 100644
--- a/tests/phpunit/unit/includes/WikiReferenceTest.php
+++ b/tests/phpunit/unit/includes/WikiReferenceTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\WikiMap\WikiReference;
+
 /**
  * @covers WikiReference
  */