Reorg: Migrate WikiMap to WikiMap/ out of includes

And WikiReference

Bug: T321882
Change-Id: I60cf4b9ef02b9d58118caa39172677ddfe03d787

19 files changed, 26 insertions, 1 deletions

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
  */