No OneTemporary
Actions

Size

68 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/tests/phpunit/includes/Output/OutputPageTest.php b/tests/phpunit/includes/Output/OutputPageTest.php
	index d55014107c8..b3daf2effab 100644
	--- a/tests/phpunit/includes/Output/OutputPageTest.php
	+++ b/tests/phpunit/includes/Output/OutputPageTest.php
	@@ -3,6 +3,7 @@
	use MediaWiki\Config\HashConfig;
	use MediaWiki\Config\MultiConfig;
	use MediaWiki\Context\RequestContext;
	+use MediaWiki\FileRepo\File\File;
	use MediaWiki\Html\Html;
	use MediaWiki\Language\ILanguageConverter;
	use MediaWiki\Language\Language;
	@@ -27,6 +28,7 @@ use MediaWiki\Request\WebRequest;
	use MediaWiki\ResourceLoader as RL;
	use MediaWiki\ResourceLoader\ResourceLoader;
	use MediaWiki\Session\SessionManager;
	+use MediaWiki\Skin\QuickTemplate;
	use MediaWiki\Tests\ResourceLoader\ResourceLoaderTestCase;
	use MediaWiki\Tests\ResourceLoader\ResourceLoaderTestModule;
	use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
	diff --git a/tests/phpunit/includes/Request/ContentSecurityPolicyTest.php b/tests/phpunit/includes/Request/ContentSecurityPolicyTest.php
	index 0a9e6fb641e..5be9573bb3f 100644
	--- a/tests/phpunit/includes/Request/ContentSecurityPolicyTest.php
	+++ b/tests/phpunit/includes/Request/ContentSecurityPolicyTest.php
	@@ -1,6 +1,7 @@
	<?php

	use MediaWiki\Context\RequestContext;
	+use MediaWiki\FileRepo\ForeignAPIRepo;
	use MediaWiki\Json\FormatJson;
	use MediaWiki\MainConfigNames;
	use MediaWiki\Request\ContentSecurityPolicy;
	diff --git a/tests/phpunit/includes/Request/FauxRequestTest.php b/tests/phpunit/includes/Request/FauxRequestTest.php
	index d7baa9a809e..7346a430907 100644
	--- a/tests/phpunit/includes/Request/FauxRequestTest.php
	+++ b/tests/phpunit/includes/Request/FauxRequestTest.php
	@@ -1,5 +1,6 @@
	<?php

	+use MediaWiki\Exception\MWException;
	use MediaWiki\MainConfigNames;
	use MediaWiki\Request\FauxRequest;
	use MediaWiki\Request\WebRequest;
	diff --git a/tests/phpunit/includes/Request/WebRequestTest.php b/tests/phpunit/includes/Request/WebRequestTest.php
	index 5a717e21e79..17ec383809b 100644
	--- a/tests/phpunit/includes/Request/WebRequestTest.php
	+++ b/tests/phpunit/includes/Request/WebRequestTest.php
	@@ -1,5 +1,6 @@
	<?php

	+use MediaWiki\Exception\MWException;
	use MediaWiki\MainConfigNames;
	use MediaWiki\Request\ProxyLookup;
	use MediaWiki\Request\WebRequest;
	diff --git a/tests/phpunit/includes/ResourceLoader/ResourceLoaderUpdateSpyTrait.php b/tests/phpunit/includes/ResourceLoader/ResourceLoaderUpdateSpyTrait.php
	index 8e1fce23144..c67ce661c50 100644
	--- a/tests/phpunit/includes/ResourceLoader/ResourceLoaderUpdateSpyTrait.php
	+++ b/tests/phpunit/includes/ResourceLoader/ResourceLoaderUpdateSpyTrait.php
	@@ -2,7 +2,7 @@

	namespace MediaWiki\Tests\ResourceLoader;

	-use EmptyBagOStuff;
	+use Wikimedia\ObjectCache\EmptyBagOStuff;
	use Wikimedia\ObjectCache\WANObjectCache;

	/**
	diff --git a/tests/phpunit/includes/Revision/RevisionStoreDbTest.php b/tests/phpunit/includes/Revision/RevisionStoreDbTest.php
	index 7f0e49dc534..544087cc514 100644
	--- a/tests/phpunit/includes/Revision/RevisionStoreDbTest.php
	+++ b/tests/phpunit/includes/Revision/RevisionStoreDbTest.php
	@@ -14,6 +14,7 @@ use MediaWiki\MainConfigNames;
	use MediaWiki\MediaWikiServices;
	use MediaWiki\Page\PageIdentity;
	use MediaWiki\Page\PageIdentityValue;
	+use MediaWiki\Page\WikiPage;
	use MediaWiki\Revision\IncompleteRevisionException;
	use MediaWiki\Revision\MutableRevisionRecord;
	use MediaWiki\Revision\RevisionAccessException;
	@@ -48,7 +49,6 @@ use Wikimedia\Rdbms\ILoadBalancer;
	use Wikimedia\Rdbms\LoadBalancer;
	use Wikimedia\Rdbms\TransactionProfiler;
	use Wikimedia\TestingAccessWrapper;
	-use WikiPage;

	/**
	* @group Database
	diff --git a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
	index 91614f56649..4ed90c11947 100644
	--- a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
	+++ b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
	@@ -25,8 +25,10 @@ use MediaWiki\Page\Event\PageRevisionUpdatedEvent;
	use MediaWiki\Page\PageIdentity;
	use MediaWiki\Page\PageIdentityValue;
	use MediaWiki\Page\ParserOutputAccess;
	+use MediaWiki\Page\WikiPage;
	use MediaWiki\Parser\ParserCacheFactory;
	use MediaWiki\Parser\ParserOptions;
	+use MediaWiki\RecentChanges\RecentChange;
	use MediaWiki\Revision\MutableRevisionRecord;
	use MediaWiki\Revision\MutableRevisionSlots;
	use MediaWiki\Revision\RevisionRecord;
	@@ -45,12 +47,10 @@ use MediaWikiIntegrationTestCase;
	use MockTitleTrait;
	use PHPUnit\Framework\Assert;
	use PHPUnit\Framework\MockObject\MockObject;
	-use RecentChange;
	use Wikimedia\ObjectCache\BagOStuff;
	use Wikimedia\Rdbms\Platform\ISQLPlatform;
	use Wikimedia\TestingAccessWrapper;
	use Wikimedia\Timestamp\ConvertibleTimestamp;
	-use WikiPage;

	/**
	* @group Database
	diff --git a/tests/phpunit/includes/Storage/PageUpdaterTest.php b/tests/phpunit/includes/Storage/PageUpdaterTest.php
	index 904ac106913..55151419638 100644
	--- a/tests/phpunit/includes/Storage/PageUpdaterTest.php
	+++ b/tests/phpunit/includes/Storage/PageUpdaterTest.php
	@@ -15,6 +15,7 @@ use MediaWiki\Message\Message;
	use MediaWiki\Page\Event\PageRevisionUpdatedEvent;
	use MediaWiki\Page\PageIdentity;
	use MediaWiki\Page\PageIdentityValue;
	+use MediaWiki\Page\WikiPage;
	use MediaWiki\Parser\ParserOptions;
	use MediaWiki\RecentChanges\ChangeTrackingEventIngress;
	use MediaWiki\RecentChanges\RecentChange;
	@@ -33,7 +34,6 @@ use MediaWiki\User\User;
	use MediaWiki\User\UserIdentity;
	use MediaWikiIntegrationTestCase;
	use PHPUnit\Framework\Assert;
	-use WikiPage;

	/**
	* @covers \MediaWiki\Storage\PageUpdater
	diff --git a/tests/phpunit/includes/actions/ActionEntryPointTest.php b/tests/phpunit/includes/actions/ActionEntryPointTest.php
	index e40dedaa187..94df036859c 100644
	--- a/tests/phpunit/includes/actions/ActionEntryPointTest.php
	+++ b/tests/phpunit/includes/actions/ActionEntryPointTest.php
	@@ -9,6 +9,7 @@ use MediaWiki\Deferred\DeferredUpdatesScopeMediaWikiStack;
	use MediaWiki\Deferred\DeferredUpdatesScopeStack;
	use MediaWiki\Exception\BadTitleError;
	use MediaWiki\MainConfigNames;
	+use MediaWiki\Page\WikiPage;
	use MediaWiki\Request\FauxRequest;
	use MediaWiki\Request\FauxResponse;
	use MediaWiki\Request\WebRequest;
	@@ -21,7 +22,6 @@ use MediaWikiIntegrationTestCase;
	use PHPUnit\Framework\Assert;
	use ReflectionMethod;
	use Wikimedia\TestingAccessWrapper;
	-use WikiPage;

	// phpcs:disable MediaWiki.Usage.SuperGlobalsUsage.SuperGlobals

	diff --git a/tests/phpunit/includes/actions/ActionFactoryIntegrationTest.php b/tests/phpunit/includes/actions/ActionFactoryIntegrationTest.php
	index 5046c2dc405..55b2dc71032 100644
	--- a/tests/phpunit/includes/actions/ActionFactoryIntegrationTest.php
	+++ b/tests/phpunit/includes/actions/ActionFactoryIntegrationTest.php
	@@ -1,9 +1,11 @@
	<?php

	+use MediaWiki\Actions\Action;
	use MediaWiki\Actions\ActionFactory;
	use MediaWiki\Context\IContextSource;
	use MediaWiki\Context\RequestContext;
	use MediaWiki\MediaWikiServices;
	+use MediaWiki\Page\Article;
	use MediaWiki\Title\Title;
	use Psr\Log\NullLogger;

	diff --git a/tests/phpunit/includes/actions/ActionTest.php b/tests/phpunit/includes/actions/ActionTest.php
	index 40505845267..a0f2a0a654e 100644
	--- a/tests/phpunit/includes/actions/ActionTest.php
	+++ b/tests/phpunit/includes/actions/ActionTest.php
	@@ -1,20 +1,24 @@
	<?php

	+use MediaWiki\Actions\Action;
	use MediaWiki\Block\DatabaseBlock;
	use MediaWiki\Block\UserBlockTarget;
	use MediaWiki\Context\DerivativeContext;
	use MediaWiki\Context\IContextSource;
	use MediaWiki\Context\RequestContext;
	use MediaWiki\DAO\WikiAwareEntity;
	+use MediaWiki\Exception\PermissionsError;
	use MediaWiki\Exception\UserBlockedError;
	use MediaWiki\MainConfigNames;
	+use MediaWiki\Page\Article;
	+use MediaWiki\Page\WikiPage;
	use MediaWiki\Permissions\PermissionManager;
	use MediaWiki\Request\FauxRequest;
	use MediaWiki\Title\Title;
	use MediaWiki\User\User;

	/**
	- * @covers \Action
	+ * @covers \MediaWiki\Actions\Action
	*
	* @group Action
	* @group Database
	@@ -179,7 +183,7 @@ class ActionTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \Action::factory
	+ * @covers \MediaWiki\Actions\Action::factory
	*
	* @dataProvider provideActions
	* @param string $requestedAction
	diff --git a/tests/phpunit/includes/actions/RollbackActionTest.php b/tests/phpunit/includes/actions/RollbackActionTest.php
	index f22e0438e58..25b4978b903 100644
	--- a/tests/phpunit/includes/actions/RollbackActionTest.php
	+++ b/tests/phpunit/includes/actions/RollbackActionTest.php
	@@ -2,11 +2,11 @@

	namespace MediaWiki\Tests\Action;

	-use Article;
	use MediaWiki\Actions\RollbackAction;
	use MediaWiki\Context\DerivativeContext;
	use MediaWiki\Context\RequestContext;
	use MediaWiki\Exception\ErrorPageError;
	+use MediaWiki\Page\Article;
	use MediaWiki\Request\FauxRequest;
	use MediaWiki\Request\WebRequest;
	use MediaWiki\Title\Title;
	diff --git a/tests/phpunit/includes/actions/WatchActionTest.php b/tests/phpunit/includes/actions/WatchActionTest.php
	index d27775ce4b6..f39aa704beb 100644
	--- a/tests/phpunit/includes/actions/WatchActionTest.php
	+++ b/tests/phpunit/includes/actions/WatchActionTest.php
	@@ -1,11 +1,15 @@
	<?php

	+use MediaWiki\Actions\WatchAction;
	use MediaWiki\Context\DerivativeContext;
	use MediaWiki\Context\IContextSource;
	use MediaWiki\Context\RequestContext;
	+use MediaWiki\Exception\UserNotLoggedIn;
	use MediaWiki\Language\Language;
	use MediaWiki\MainConfigNames;
	use MediaWiki\Message\Message;
	+use MediaWiki\Page\Article;
	+use MediaWiki\Page\WikiPage;
	use MediaWiki\Permissions\PermissionManager;
	use MediaWiki\Request\WebRequest;
	use MediaWiki\Status\Status;
	@@ -23,7 +27,7 @@ use Wikimedia\TestingAccessWrapper;
	use Wikimedia\Timestamp\ConvertibleTimestamp;

	/**
	- * @covers \WatchAction
	+ * @covers \MediaWiki\Actions\WatchAction
	*
	* @group Action
	*/
	@@ -75,28 +79,28 @@ class WatchActionTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \WatchAction::getName()
	+ * @covers \MediaWiki\Actions\WatchAction::getName()
	*/
	public function testGetName() {
	$this->assertEquals( 'watch', $this->watchAction->getName() );
	}

	/**
	- * @covers \WatchAction::requiresUnblock()
	+ * @covers \MediaWiki\Actions\WatchAction::requiresUnblock()
	*/
	public function testRequiresUnlock() {
	$this->assertFalse( $this->watchAction->requiresUnblock() );
	}

	/**
	- * @covers \WatchAction::doesWrites()
	+ * @covers \MediaWiki\Actions\WatchAction::doesWrites()
	*/
	public function testDoesWrites() {
	$this->assertTrue( $this->watchAction->doesWrites() );
	}

	/**
	- * @covers \WatchAction::onSubmit()
	+ * @covers \MediaWiki\Actions\WatchAction::onSubmit()
	*/
	public function testOnSubmit() {
	/** @var Status $actual */
	@@ -106,7 +110,7 @@ class WatchActionTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \WatchAction::onSubmit()
	+ * @covers \MediaWiki\Actions\WatchAction::onSubmit()
	*/
	public function testOnSubmitHookAborted() {
	// WatchlistExpiry feature flag.
	@@ -151,7 +155,7 @@ class WatchActionTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \WatchAction::checkCanExecute()
	+ * @covers \MediaWiki\Actions\WatchAction::checkCanExecute()
	*/
	public function testShowUserNotLoggedIn() {
	$notLoggedInUser = new User();
	@@ -167,7 +171,7 @@ class WatchActionTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \WatchAction::checkCanExecute()
	+ * @covers \MediaWiki\Actions\WatchAction::checkCanExecute()
	*/
	public function testShowUserLoggedInNoException() {
	$this->setService( 'PermissionManager', $this->createMock( PermissionManager::class ) );
	@@ -192,8 +196,8 @@ class WatchActionTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \WatchAction::onSuccess()
	- * @covers \WatchAction::makeSuccessMessage()
	+ * @covers \MediaWiki\Actions\WatchAction::onSuccess()
	+ * @covers \MediaWiki\Actions\WatchAction::makeSuccessMessage()
	*/
	public function testOnSuccessMainNamespaceTitle() {
	$testContext = $this->watchAction->getContext();
	@@ -210,8 +214,8 @@ class WatchActionTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \WatchAction::onSuccess()
	- * @covers \WatchAction::makeSuccessMessage()
	+ * @covers \MediaWiki\Actions\WatchAction::onSuccess()
	+ * @covers \MediaWiki\Actions\WatchAction::makeSuccessMessage()
	*/
	public function testOnSuccessTalkPage() {
	$testContext = new DerivativeContext( $this->watchAction->getContext() );
	@@ -231,8 +235,8 @@ class WatchActionTest extends MediaWikiIntegrationTestCase {

	/**
	* @dataProvider provideOnSuccessDifferentMessages
	- * @covers \WatchAction::onSuccess()
	- * @covers \WatchAction::makeSuccessMessage()
	+ * @covers \MediaWiki\Actions\WatchAction::onSuccess()
	+ * @covers \MediaWiki\Actions\WatchAction::makeSuccessMessage()
	*/
	public function testOnSuccessDifferentMessages(
	$watchlistExpiry, $expectedMessage, $prefixedTitle, $submittedExpiry
	@@ -328,7 +332,7 @@ class WatchActionTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \WatchAction::getExpiryOptions()
	+ * @covers \MediaWiki\Actions\WatchAction::getExpiryOptions()
	*/
	public function testGetExpiryOptions() {
	// Fake current time to be 2020-06-10T00:00:00Z
	@@ -405,7 +409,7 @@ class WatchActionTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \WatchAction::getExpiryOptions()
	+ * @covers \MediaWiki\Actions\WatchAction::getExpiryOptions()
	*/
	public function testGetExpiryOptionsWithInvalidTranslations() {
	$mockMessageLocalizer = $this->createMock( MockMessageLocalizer::class );
	@@ -427,7 +431,7 @@ class WatchActionTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \WatchAction::getExpiryOptions()
	+ * @covers \MediaWiki\Actions\WatchAction::getExpiryOptions()
	*/
	public function testGetExpiryOptionsWithPartialInvalidTranslations() {
	$mockMessageLocalizer = $this->createMock( MockMessageLocalizer::class );
	diff --git a/tests/phpunit/includes/api/ApiBaseTest.php b/tests/phpunit/includes/api/ApiBaseTest.php
	index b93783c9584..fc271950b74 100644
	--- a/tests/phpunit/includes/api/ApiBaseTest.php
	+++ b/tests/phpunit/includes/api/ApiBaseTest.php
	@@ -13,6 +13,7 @@ use MediaWiki\Context\RequestContext;
	use MediaWiki\Exception\MWException;
	use MediaWiki\MediaWikiServices;
	use MediaWiki\Message\Message;
	+use MediaWiki\Page\WikiPage;
	use MediaWiki\ParamValidator\TypeDef\NamespaceDef;
	use MediaWiki\Permissions\PermissionStatus;
	use MediaWiki\Request\FauxRequest;
	@@ -24,7 +25,6 @@ use Wikimedia\ParamValidator\TypeDef\EnumDef;
	use Wikimedia\ParamValidator\TypeDef\IntegerDef;
	use Wikimedia\ParamValidator\TypeDef\StringDef;
	use Wikimedia\TestingAccessWrapper;
	-use WikiPage;

	/**
	* @group API
	diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php
	index c13eebecc13..31cac441e33 100644
	--- a/tests/phpunit/includes/api/ApiEditPageTest.php
	+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
	@@ -8,6 +8,7 @@ use MediaWiki\Content\JavaScriptContent;
	use MediaWiki\Content\WikitextContent;
	use MediaWiki\Context\RequestContext;
	use MediaWiki\MainConfigNames;
	+use MediaWiki\Page\WikiPage;
	use MediaWiki\Revision\RevisionRecord;
	use MediaWiki\Status\Status;
	use MediaWiki\Tests\User\TempUser\TempUserTestTrait;
	@@ -17,7 +18,6 @@ use MediaWiki\User\User;
	use MediaWiki\Utils\MWTimestamp;
	use RevisionDeleter;
	use Wikimedia\Rdbms\IDBAccessObject;
	-use WikiPage;

	/**
	* Tests for MediaWiki api.php?action=edit.
	diff --git a/tests/phpunit/includes/content/ContentHandlerTest.php b/tests/phpunit/includes/content/ContentHandlerTest.php
	index 09284b20234..07de8ca3ae9 100644
	--- a/tests/phpunit/includes/content/ContentHandlerTest.php
	+++ b/tests/phpunit/includes/content/ContentHandlerTest.php
	@@ -10,6 +10,7 @@ use MediaWiki\Content\ValidationParams;
	use MediaWiki\Content\WikitextContent;
	use MediaWiki\Content\WikitextContentHandler;
	use MediaWiki\Context\RequestContext;
	+use MediaWiki\Exception\MWException;
	use MediaWiki\Language\Language;
	use MediaWiki\Languages\LanguageNameUtils;
	use MediaWiki\Linker\LinkRenderer;
	@@ -17,6 +18,7 @@ use MediaWiki\MainConfigNames;
	use MediaWiki\Page\Hook\OpportunisticLinksUpdateHook;
	use MediaWiki\Page\PageIdentity;
	use MediaWiki\Page\PageIdentityValue;
	+use MediaWiki\Page\WikiPage;
	use MediaWiki\Parser\MagicWordFactory;
	use MediaWiki\Parser\ParserFactory;
	use MediaWiki\Parser\ParserOutput;
	diff --git a/tests/phpunit/includes/content/ContentModelChangeTest.php b/tests/phpunit/includes/content/ContentModelChangeTest.php
	index 26b7378f834..12271ee355c 100644
	--- a/tests/phpunit/includes/content/ContentModelChangeTest.php
	+++ b/tests/phpunit/includes/content/ContentModelChangeTest.php
	@@ -4,6 +4,7 @@ use MediaWiki\Content\ContentHandler;
	use MediaWiki\Content\ContentModelChange;
	use MediaWiki\Context\RequestContext;
	use MediaWiki\Page\PageIdentity;
	+use MediaWiki\Page\WikiPage;
	use MediaWiki\Page\WikiPageFactory;
	use MediaWiki\Permissions\Authority;
	use MediaWiki\Permissions\PermissionStatus;
	diff --git a/tests/phpunit/includes/debug/MWDebugTest.php b/tests/phpunit/includes/debug/MWDebugTest.php
	index a55fd39df21..c584c59cfcf 100644
	--- a/tests/phpunit/includes/debug/MWDebugTest.php
	+++ b/tests/phpunit/includes/debug/MWDebugTest.php
	@@ -4,6 +4,7 @@ use MediaWiki\Api\ApiFormatXml;
	use MediaWiki\Api\ApiResult;
	use MediaWiki\Context\RequestContext;
	use MediaWiki\Debug\MWDebug;
	+use MediaWiki\Exception\MWExceptionHandler;
	use MediaWiki\Logger\LoggerFactory;
	use MediaWiki\MainConfigNames;
	use MediaWiki\Request\FauxRequest;
	diff --git a/tests/phpunit/includes/diff/DifferenceEngineTest.php b/tests/phpunit/includes/diff/DifferenceEngineTest.php
	index 3b2e57f15dd..4d54150b0fa 100644
	--- a/tests/phpunit/includes/diff/DifferenceEngineTest.php
	+++ b/tests/phpunit/includes/diff/DifferenceEngineTest.php
	@@ -5,6 +5,7 @@ use MediaWiki\Content\Content;
	use MediaWiki\Content\ContentHandler;
	use MediaWiki\Context\DerivativeContext;
	use MediaWiki\Context\RequestContext;
	+use MediaWiki\Exception\PermissionsError;
	use MediaWiki\MainConfigNames;
	use MediaWiki\Output\OutputPage;
	use MediaWiki\Permissions\SimpleAuthority;
	diff --git a/tests/phpunit/includes/editpage/EditPageConstraintsTest.php b/tests/phpunit/includes/editpage/EditPageConstraintsTest.php
	index 039adc73c32..fca97cdeb34 100644
	--- a/tests/phpunit/includes/editpage/EditPageConstraintsTest.php
	+++ b/tests/phpunit/includes/editpage/EditPageConstraintsTest.php
	@@ -6,6 +6,8 @@ use MediaWiki\Context\RequestContext;
	use MediaWiki\EditPage\EditPage;
	use MediaWiki\EditPage\SpamChecker;
	use MediaWiki\MainConfigNames;
	+use MediaWiki\Page\Article;
	+use MediaWiki\Page\WikiPage;
	use MediaWiki\Permissions\PermissionManager;
	use MediaWiki\Permissions\PermissionStatus;
	use MediaWiki\Request\FauxRequest;
	diff --git a/tests/phpunit/includes/editpage/EditPageTest.php b/tests/phpunit/includes/editpage/EditPageTest.php
	index 57bbcf9e2cd..22bce057119 100644
	--- a/tests/phpunit/includes/editpage/EditPageTest.php
	+++ b/tests/phpunit/includes/editpage/EditPageTest.php
	@@ -6,8 +6,11 @@ use MediaWiki\Context\RequestContext;
	use MediaWiki\Deferred\DeferredUpdates;
	use MediaWiki\EditPage\EditPage;
	use MediaWiki\Exception\ErrorPageError;
	+use MediaWiki\Exception\MWException;
	use MediaWiki\MainConfigNames;
	use MediaWiki\MainConfigSchema;
	+use MediaWiki\Page\Article;
	+use MediaWiki\Page\WikiPage;
	use MediaWiki\Request\FauxRequest;
	use MediaWiki\Revision\RevisionRecord;
	use MediaWiki\Status\Status;
	diff --git a/tests/phpunit/includes/exception/BadTitleErrorTest.php b/tests/phpunit/includes/exception/BadTitleErrorTest.php
	index 8569ea72cf6..3ce12c9b6fa 100644
	--- a/tests/phpunit/includes/exception/BadTitleErrorTest.php
	+++ b/tests/phpunit/includes/exception/BadTitleErrorTest.php
	@@ -1,9 +1,10 @@
	<?php

	+use MediaWiki\Exception\BadTitleError;
	use MediaWiki\Output\OutputPage;

	/**
	- * @covers \BadTitleError
	+ * @covers \MediaWiki\Exception\BadTitleError
	* @author Addshore
	*/
	class BadTitleErrorTest extends MediaWikiIntegrationTestCase {
	diff --git a/tests/phpunit/includes/exception/MWExceptionTest.php b/tests/phpunit/includes/exception/MWExceptionTest.php
	index 621d2601ac9..7485cc352a4 100644
	--- a/tests/phpunit/includes/exception/MWExceptionTest.php
	+++ b/tests/phpunit/includes/exception/MWExceptionTest.php
	@@ -1,9 +1,11 @@
	<?php

	+use MediaWiki\Exception\MWException;
	+use MediaWiki\Exception\MWExceptionHandler;
	use MediaWiki\MainConfigNames;

	/**
	- * @covers \MWException
	+ * @covers \MediaWiki\Exception\MWException
	* @author Antoine Musso
	*/
	class MWExceptionTest extends MediaWikiIntegrationTestCase {
	diff --git a/tests/phpunit/includes/exception/ReadOnlyErrorTest.php b/tests/phpunit/includes/exception/ReadOnlyErrorTest.php
	index 734d45e4534..5f1cfa75dfe 100644
	--- a/tests/phpunit/includes/exception/ReadOnlyErrorTest.php
	+++ b/tests/phpunit/includes/exception/ReadOnlyErrorTest.php
	@@ -1,9 +1,10 @@
	<?php

	+use MediaWiki\Exception\ReadOnlyError;
	use MediaWiki\Tests\Unit\DummyServicesTrait;

	/**
	- * @covers \ReadOnlyError
	+ * @covers \MediaWiki\Exception\ReadOnlyError
	* @author Addshore
	*/
	class ReadOnlyErrorTest extends MediaWikiIntegrationTestCase {
	diff --git a/tests/phpunit/includes/exception/ThrottledErrorTest.php b/tests/phpunit/includes/exception/ThrottledErrorTest.php
	index a20c6b9bab5..84c4eb963fb 100644
	--- a/tests/phpunit/includes/exception/ThrottledErrorTest.php
	+++ b/tests/phpunit/includes/exception/ThrottledErrorTest.php
	@@ -1,9 +1,10 @@
	<?php

	+use MediaWiki\Exception\ThrottledError;
	use MediaWiki\Output\OutputPage;

	/**
	- * @covers \ThrottledError
	+ * @covers \MediaWiki\Exception\ThrottledError
	* @author Addshore
	*/
	class ThrottledErrorTest extends MediaWikiIntegrationTestCase {
	diff --git a/tests/phpunit/includes/exception/UserNotLoggedInTest.php b/tests/phpunit/includes/exception/UserNotLoggedInTest.php
	index 935643493e2..e6864244469 100644
	--- a/tests/phpunit/includes/exception/UserNotLoggedInTest.php
	+++ b/tests/phpunit/includes/exception/UserNotLoggedInTest.php
	@@ -1,12 +1,13 @@
	<?php

	use MediaWiki\Context\RequestContext;
	+use MediaWiki\Exception\UserNotLoggedIn;
	use MediaWiki\Request\FauxRequest;
	use MediaWiki\Tests\User\TempUser\TempUserTestTrait;
	use MediaWiki\Title\Title;

	/**
	- * @covers \UserNotLoggedIn
	+ * @covers \MediaWiki\Exception\UserNotLoggedIn
	* @author Addshore
	* @author Dreamy Jazz
	* @group Database
	diff --git a/tests/phpunit/includes/externalstore/ExternalStoreAccessTest.php b/tests/phpunit/includes/externalstore/ExternalStoreAccessTest.php
	index b00dc48fad1..11c45ec5511 100644
	--- a/tests/phpunit/includes/externalstore/ExternalStoreAccessTest.php
	+++ b/tests/phpunit/includes/externalstore/ExternalStoreAccessTest.php
	@@ -1,5 +1,6 @@
	<?php

	+use MediaWiki\Exception\ReadOnlyError;
	use MediaWiki\Tests\Unit\DummyServicesTrait;
	use PHPUnit\Framework\MockObject\MockObject;

	diff --git a/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php b/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php
	index 7a77ac294e2..ac53f5f44e8 100644
	--- a/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php
	+++ b/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php
	@@ -1,5 +1,6 @@
	<?php

	+use MediaWiki\FileRepo\FileBackendDBRepoWrapper;
	use MediaWiki\WikiMap\WikiMap;
	use Wikimedia\FileBackend\FSFileBackend;
	use Wikimedia\Rdbms\IDatabase;
	@@ -11,7 +12,7 @@ class FileBackendDBRepoWrapperTest extends MediaWikiIntegrationTestCase {

	/**
	* @dataProvider getBackendPathsProvider
	- * @covers \FileBackendDBRepoWrapper::getBackendPaths
	+ * @covers \MediaWiki\FileRepo\FileBackendDBRepoWrapper::getBackendPaths
	*/
	public function testGetBackendPaths(
	$mocks,
	@@ -90,7 +91,7 @@ class FileBackendDBRepoWrapperTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \FileBackendDBRepoWrapper::getFileContentsMulti
	+ * @covers \MediaWiki\FileRepo\FileBackendDBRepoWrapper::getFileContentsMulti
	*/
	public function testGetFileContentsMulti() {
	[ $dbMock, $backendMock, $wrapperMock ] = $this->getMocks();
	diff --git a/tests/phpunit/includes/filerepo/FileRepoTest.php b/tests/phpunit/includes/filerepo/FileRepoTest.php
	index 43bceb7d3df..e6e6ee3e98a 100644
	--- a/tests/phpunit/includes/filerepo/FileRepoTest.php
	+++ b/tests/phpunit/includes/filerepo/FileRepoTest.php
	@@ -1,10 +1,11 @@
	<?php

	+use MediaWiki\FileRepo\FileRepo;
	use MediaWiki\MainConfigNames;
	use Wikimedia\FileBackend\FSFileBackend;

	/**
	- * @covers \FileRepo
	+ * @covers \MediaWiki\FileRepo\FileRepo
	*/
	class FileRepoTest extends MediaWikiIntegrationTestCase {

	diff --git a/tests/phpunit/includes/filerepo/LocalRepoTest.php b/tests/phpunit/includes/filerepo/LocalRepoTest.php
	index 66d6b6b3c9c..c5478006834 100644
	--- a/tests/phpunit/includes/filerepo/LocalRepoTest.php
	+++ b/tests/phpunit/includes/filerepo/LocalRepoTest.php
	@@ -1,5 +1,8 @@
	<?php

	+use MediaWiki\FileRepo\File\LocalFile;
	+use MediaWiki\FileRepo\File\OldLocalFile;
	+use MediaWiki\FileRepo\LocalRepo;
	use MediaWiki\MainConfigNames;
	use MediaWiki\Status\Status;
	use MediaWiki\Title\Title;
	@@ -10,8 +13,8 @@ use Wikimedia\ObjectCache\WANObjectCache;

	/**
	* @group Database
	- * @covers \FileRepo
	- * @covers \LocalRepo
	+ * @covers \MediaWiki\FileRepo\FileRepo
	+ * @covers \MediaWiki\FileRepo\LocalRepo
	*/
	class LocalRepoTest extends MediaWikiIntegrationTestCase {
	/**
	diff --git a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
	index 20b215a3039..c134b208cbd 100644
	--- a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
	+++ b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
	@@ -1,5 +1,7 @@
	<?php

	+use MediaWiki\FileRepo\FileRepo;
	+use MediaWiki\FileRepo\LocalRepo;
	use MediaWiki\WikiMap\WikiMap;
	use PHPUnit\Framework\MockObject\MockObject;
	use Wikimedia\FileBackend\FSFile\TempFSFile;
	diff --git a/tests/phpunit/includes/filerepo/RepoGroupTest.php b/tests/phpunit/includes/filerepo/RepoGroupTest.php
	index 2a4be946716..b746c8d2519 100644
	--- a/tests/phpunit/includes/filerepo/RepoGroupTest.php
	+++ b/tests/phpunit/includes/filerepo/RepoGroupTest.php
	@@ -1,9 +1,10 @@
	<?php

	+use MediaWiki\FileRepo\ForeignAPIRepo;
	use MediaWiki\MainConfigNames;

	/**
	- * @covers \RepoGroup
	+ * @covers \MediaWiki\FileRepo\RepoGroup
	*/
	class RepoGroupTest extends MediaWikiIntegrationTestCase {

	@@ -48,6 +49,7 @@ class RepoGroupTest extends MediaWikiIntegrationTestCase {
	] ] );
	}
	}
	+use MediaWiki\FileRepo\FileRepo;

	/**
	* Quick helper class to use as a mock callback for RepoGroup::forEachForeignRepo.
	diff --git a/tests/phpunit/includes/filerepo/StoreBatchTest.php b/tests/phpunit/includes/filerepo/StoreBatchTest.php
	index 2c1e35dca0b..3112795bd8c 100644
	--- a/tests/phpunit/includes/filerepo/StoreBatchTest.php
	+++ b/tests/phpunit/includes/filerepo/StoreBatchTest.php
	@@ -1,5 +1,6 @@
	<?php

	+use MediaWiki\FileRepo\FileRepo;
	use MediaWiki\Status\Status;
	use MediaWiki\WikiMap\WikiMap;
	use Wikimedia\FileBackend\FSFileBackend;
	@@ -127,7 +128,7 @@ class StoreBatchTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \FileRepo::store
	+ * @covers \MediaWiki\FileRepo\FileRepo::store
	*/
	public function teststore() {
	global $IP;
	diff --git a/tests/phpunit/includes/filerepo/ThumbnailEntryPointTest.php b/tests/phpunit/includes/filerepo/ThumbnailEntryPointTest.php
	index 3c9cd1c689b..4af0b6ceead 100644
	--- a/tests/phpunit/includes/filerepo/ThumbnailEntryPointTest.php
	+++ b/tests/phpunit/includes/filerepo/ThumbnailEntryPointTest.php
	@@ -1,6 +1,7 @@
	<?php

	use MediaWiki\Context\RequestContext;
	+use MediaWiki\FileRepo\File\UnregisteredLocalFile;
	use MediaWiki\FileRepo\ThumbnailEntryPoint;
	use MediaWiki\MainConfigNames;
	use MediaWiki\Permissions\SimpleAuthority;
	diff --git a/tests/phpunit/includes/filerepo/file/FileTest.php b/tests/phpunit/includes/filerepo/file/FileTest.php
	index 31c0fa1f091..a41a18dbe9f 100644
	--- a/tests/phpunit/includes/filerepo/file/FileTest.php
	+++ b/tests/phpunit/includes/filerepo/file/FileTest.php
	@@ -1,5 +1,7 @@
	<?php

	+use MediaWiki\FileRepo\File\File;
	+use MediaWiki\FileRepo\FileRepo;
	use MediaWiki\MainConfigNames;
	use MediaWiki\Page\PageIdentityValue;
	use MediaWiki\Title\TitleValue;
	@@ -15,7 +17,7 @@ class FileTest extends MediaWikiMediaTestCase {
	* @param string $filename
	* @param bool $expected
	* @dataProvider providerCanAnimate
	- * @covers \File::canAnimateThumbIfAppropriate
	+ * @covers \MediaWiki\FileRepo\File\File::canAnimateThumbIfAppropriate
	*/
	public function testCanAnimateThumbIfAppropriate( $filename, $expected ) {
	$this->overrideConfigValue( MainConfigNames::MaxAnimatedGifArea, 9000 );
	@@ -41,7 +43,7 @@ class FileTest extends MediaWikiMediaTestCase {

	/**
	* @dataProvider getThumbnailBucketProvider
	- * @covers \File::getThumbnailBucket
	+ * @covers \MediaWiki\FileRepo\File\File::getThumbnailBucket
	*/
	public function testGetThumbnailBucket( $data ) {
	$this->overrideConfigValues( [
	@@ -144,7 +146,7 @@ class FileTest extends MediaWikiMediaTestCase {

	/**
	* @dataProvider getThumbnailSourceProvider
	- * @covers \File::getThumbnailSource
	+ * @covers \MediaWiki\FileRepo\File\File::getThumbnailSource
	*/
	public function testGetThumbnailSource( $data ) {
	$backendMock = $this->getMockBuilder( FSFileBackend::class )
	@@ -255,7 +257,7 @@ class FileTest extends MediaWikiMediaTestCase {

	/**
	* @dataProvider generateBucketsIfNeededProvider
	- * @covers \File::generateBucketsIfNeeded
	+ * @covers \MediaWiki\FileRepo\File\File::generateBucketsIfNeeded
	*/
	public function testGenerateBucketsIfNeeded( $data ) {
	$this->overrideConfigValue( MainConfigNames::ThumbnailBuckets, $data['buckets'] );
	@@ -397,7 +399,7 @@ class FileTest extends MediaWikiMediaTestCase {
	}

	/**
	- * @covers \File::getDisplayWidthHeight
	+ * @covers \MediaWiki\FileRepo\File\File::getDisplayWidthHeight
	* @dataProvider providerGetDisplayWidthHeight
	* @param array $dim Array [maxWidth, maxHeight, width, height]
	* @param array $expected Array [width, height] The width and height we expect to display at
	@@ -452,7 +454,7 @@ class FileTest extends MediaWikiMediaTestCase {
	}

	/**
	- * @covers \File::normalizeTitle
	+ * @covers \MediaWiki\FileRepo\File\File::normalizeTitle
	* @dataProvider provideNormalizeTitle
	*/
	public function testNormalizeTitle( $title, $expected ) {
	@@ -470,7 +472,7 @@ class FileTest extends MediaWikiMediaTestCase {
	}

	/**
	- * @covers \File::normalizeTitle
	+ * @covers \MediaWiki\FileRepo\File\File::normalizeTitle
	* @dataProvider provideNormalizeTitleFails
	*/
	public function testNormalizeTitleFails( $title ) {
	@@ -482,8 +484,8 @@ class FileTest extends MediaWikiMediaTestCase {
	}

	/**
	- * @covers \File::setHandlerState
	- * @covers \File::getHandlerState
	+ * @covers \MediaWiki\FileRepo\File\File::setHandlerState
	+ * @covers \MediaWiki\FileRepo\File\File::getHandlerState
	*/
	public function testSetHandlerState() {
	$obj = (object)[];
	@@ -497,8 +499,8 @@ class FileTest extends MediaWikiMediaTestCase {
	}

	/**
	- * @covers \File::thumbName
	- * @covers \File::generateThumbName
	+ * @covers \MediaWiki\FileRepo\File\File::thumbName
	+ * @covers \MediaWiki\FileRepo\File\File::generateThumbName
	*/
	public function testThumbNameSteps() {
	$this->overrideConfigValue( MainConfigNames::ThumbnailSteps, [ 10, 100, 200 ] );
	@@ -525,8 +527,8 @@ class FileTest extends MediaWikiMediaTestCase {
	}

	/**
	- * @covers \File::thumbName
	- * @covers \File::generateThumbName
	+ * @covers \MediaWiki\FileRepo\File\File::thumbName
	+ * @covers \MediaWiki\FileRepo\File\File::generateThumbName
	*/
	public function testThumbNameStepsRatio() {
	$this->overrideConfigValue( MainConfigNames::ThumbnailSteps, [ 10, 100, 200 ] );
	diff --git a/tests/phpunit/includes/filerepo/file/LocalFileTest.php b/tests/phpunit/includes/filerepo/file/LocalFileTest.php
	index 031ee32f9ed..33fbad1f653 100644
	--- a/tests/phpunit/includes/filerepo/file/LocalFileTest.php
	+++ b/tests/phpunit/includes/filerepo/file/LocalFileTest.php
	@@ -5,6 +5,11 @@
	* @todo Split tests into providers and test methods
	*/

	+use MediaWiki\FileRepo\File\ArchivedFile;
	+use MediaWiki\FileRepo\File\File;
	+use MediaWiki\FileRepo\File\LocalFile;
	+use MediaWiki\FileRepo\File\OldLocalFile;
	+use MediaWiki\FileRepo\LocalRepo;
	use MediaWiki\MainConfigNames;
	use MediaWiki\MediaWikiServices;
	use MediaWiki\Page\Event\PageRevisionUpdatedEvent;
	@@ -48,7 +53,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \File::getHashPath
	+ * @covers \MediaWiki\FileRepo\File\File::getHashPath
	* @dataProvider provideGetHashPath
	* @param string $expected
	* @param bool $capitalLinks
	@@ -69,7 +74,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \File::getRel
	+ * @covers \MediaWiki\FileRepo\File\File::getRel
	* @dataProvider provideGetRel
	* @param string $expected
	* @param bool $capitalLinks
	@@ -91,7 +96,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \File::getUrlRel
	+ * @covers \MediaWiki\FileRepo\File\File::getUrlRel
	* @dataProvider provideGetUrlRel
	* @param string $expected
	* @param bool $capitalLinks
	@@ -113,7 +118,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \File::getArchivePath
	+ * @covers \MediaWiki\FileRepo\File\File::getArchivePath
	* @dataProvider provideGetArchivePath
	* @param string $expected
	* @param bool $capitalLinks
	@@ -142,7 +147,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \File::getThumbPath
	+ * @covers \MediaWiki\FileRepo\File\File::getThumbPath
	* @dataProvider provideGetThumbPath
	* @param string $expected
	* @param bool $capitalLinks
	@@ -171,7 +176,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \File::getArchiveUrl
	+ * @covers \MediaWiki\FileRepo\File\File::getArchiveUrl
	* @dataProvider provideGetArchiveUrl
	* @param string $expected
	* @param bool $capitalLinks
	@@ -195,7 +200,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \File::getThumbUrl
	+ * @covers \MediaWiki\FileRepo\File\File::getThumbUrl
	* @dataProvider provideGetThumbUrl
	* @param string $expected
	* @param bool $capitalLinks
	@@ -219,7 +224,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \File::getArchiveVirtualUrl
	+ * @covers \MediaWiki\FileRepo\File\File::getArchiveVirtualUrl
	* @dataProvider provideGetArchiveVirtualUrl
	* @param string $expected
	* @param bool $capitalLinks
	@@ -245,7 +250,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \File::getThumbVirtualUrl
	+ * @covers \MediaWiki\FileRepo\File\File::getThumbVirtualUrl
	* @dataProvider provideGetThumbVirtualUrl
	* @param string $expected
	* @param bool $capitalLinks
	@@ -269,7 +274,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \File::getUrl
	+ * @covers \MediaWiki\FileRepo\File\File::getUrl
	* @dataProvider provideGetUrl
	* @param string $expected
	* @param bool $capitalLinks
	@@ -290,7 +295,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \LocalFile::getUploader
	+ * @covers \MediaWiki\FileRepo\File\LocalFile::getUploader
	*/
	public function testGetUploaderForNonExistingFile() {
	$file = ( new LocalRepo( self::getDefaultInfo() ) )->newFile( 'test!' );
	@@ -411,7 +416,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {

	/**
	* @dataProvider providePermissionChecks
	- * @covers \LocalFile::getUploader
	+ * @covers \MediaWiki\FileRepo\File\LocalFile::getUploader
	*/
	public function testGetUploader(
	Authority $performer,
	@@ -429,7 +434,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {

	/**
	* @dataProvider providePermissionChecks
	- * @covers \ArchivedFile::getDescription
	+ * @covers \MediaWiki\FileRepo\File\ArchivedFile::getDescription
	*/
	public function testGetDescription(
	Authority $performer,
	@@ -447,7 +452,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {

	/**
	* @dataProvider providePermissionChecks
	- * @covers \ArchivedFile::getUploader
	+ * @covers \MediaWiki\FileRepo\File\ArchivedFile::getUploader
	*/
	public function testArchivedGetUploader(
	Authority $performer,
	@@ -465,7 +470,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {

	/**
	* @dataProvider providePermissionChecks
	- * @covers \LocalFile::getDescription
	+ * @covers \MediaWiki\FileRepo\File\LocalFile::getDescription
	*/
	public function testArchivedGetDescription(
	Authority $performer,
	@@ -482,7 +487,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \File::getDescriptionShortUrl
	+ * @covers \MediaWiki\FileRepo\File\File::getDescriptionShortUrl
	*/
	public function testDescriptionShortUrlForNonExistingFile() {
	$file = ( new LocalRepo( self::getDefaultInfo() ) )->newFile( 'test!' );
	@@ -490,7 +495,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \LocalFile::getDescriptionText
	+ * @covers \MediaWiki\FileRepo\File\LocalFile::getDescriptionText
	*/
	public function testDescriptionText_NonExisting() {
	$file = ( new LocalRepo( self::getDefaultInfo() ) )->newFile( 'test!' );
	@@ -498,7 +503,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \LocalFile::getDescriptionText
	+ * @covers \MediaWiki\FileRepo\File\LocalFile::getDescriptionText
	*/
	public function testDescriptionText_Existing() {
	$this->assertTrue( $this->editPage(
	@@ -545,8 +550,8 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	* Test loadFromDB() and loadFromCache() and helpers
	*
	* @dataProvider provideLoadFromDBAndCache
	- * @covers \File
	- * @covers \LocalFile
	+ * @covers \MediaWiki\FileRepo\File\File
	+ * @covers \MediaWiki\FileRepo\File\LocalFile
	* @param string $meta
	* @param array $blobs Metadata blob values
	* @param int\|false $largeItemSize The size of the "large" metadata item,
	@@ -698,7 +703,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	/**
	* Test the legacy function LocalFile::getMetadata()
	* @dataProvider provideLegacyMetadataRoundTrip
	- * @covers \LocalFile
	+ * @covers \MediaWiki\FileRepo\File\LocalFile
	*/
	public function testLegacyMetadataRoundTrip( $meta ) {
	$file = new class( $meta ) extends LocalFile {
	@@ -808,7 +813,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	* Test recordUpload3() and confirm that file properties are reflected back
	* after loading the new file from the DB.
	*
	- * @covers \LocalFile
	+ * @covers \MediaWiki\FileRepo\File\LocalFile
	* @dataProvider provideRecordUpload3
	* @param array $props File properties
	* @param array $conf LocalRepo configuration overrides
	@@ -848,7 +853,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \LocalFile
	+ * @covers \MediaWiki\FileRepo\File\LocalFile
	*/
	public function testUpload() {
	$repo = $this->getLocalRepoForUpload();
	@@ -882,7 +887,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \LocalFile
	+ * @covers \MediaWiki\FileRepo\File\LocalFile
	*/
	public function testUpload_updatePropagation() {
	// Clear some extension hook handlers that may interfere with mock object expectations.
	@@ -929,7 +934,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \LocalFile
	+ * @covers \MediaWiki\FileRepo\File\LocalFile
	*/
	public function testUpload_eventEmission() {
	$repo = $this->getLocalRepoForUpload();
	@@ -976,7 +981,7 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \LocalFile
	+ * @covers \MediaWiki\FileRepo\File\LocalFile
	*/
	public function testReUpload_eventEmission() {
	// initial upload
	@@ -1062,8 +1067,8 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	/**
	* Test reserializeMetadata() via maybeUpgradeRow()
	*
	- * @covers \LocalFile::maybeUpgradeRow
	- * @covers \LocalFile::reserializeMetadata
	+ * @covers \MediaWiki\FileRepo\File\LocalFile::maybeUpgradeRow
	+ * @covers \MediaWiki\FileRepo\File\LocalFile::reserializeMetadata
	* @dataProvider provideReserializeMetadata
	*/
	public function testReserializeMetadata( $input, $expected ) {
	@@ -1126,8 +1131,8 @@ class LocalFileTest extends MediaWikiIntegrationTestCase {
	/**
	* Test upgradeRow() via maybeUpgradeRow()
	*
	- * @covers \LocalFile::maybeUpgradeRow
	- * @covers \LocalFile::upgradeRow
	+ * @covers \MediaWiki\FileRepo\File\LocalFile::maybeUpgradeRow
	+ * @covers \MediaWiki\FileRepo\File\LocalFile::upgradeRow
	*/
	public function testUpgradeRow() {
	$repo = new LocalRepo( [
	diff --git a/tests/phpunit/includes/import/ImportFailureTest.php b/tests/phpunit/includes/import/ImportFailureTest.php
	index 1f3d4f5599d..7b3a79ac4b3 100644
	--- a/tests/phpunit/includes/import/ImportFailureTest.php
	+++ b/tests/phpunit/includes/import/ImportFailureTest.php
	@@ -1,6 +1,7 @@
	<?php

	use MediaWiki\Config\HashConfig;
	+use MediaWiki\Exception\MWUnknownContentModelException;
	use MediaWiki\MainConfigNames;

	/**
	diff --git a/tests/phpunit/includes/import/ImportTemporaryUserIntegrationTest.php b/tests/phpunit/includes/import/ImportTemporaryUserIntegrationTest.php
	index 767e1007b1b..f2fe01e5301 100644
	--- a/tests/phpunit/includes/import/ImportTemporaryUserIntegrationTest.php
	+++ b/tests/phpunit/includes/import/ImportTemporaryUserIntegrationTest.php
	@@ -2,6 +2,7 @@

	use MediaWiki\Context\RequestContext;
	use MediaWiki\MainConfigNames;
	+use MediaWiki\RecentChanges\RecentChange;
	use MediaWiki\Tests\User\TempUser\TempUserTestTrait;
	use Wikimedia\Timestamp\ConvertibleTimestamp;

	diff --git a/tests/phpunit/includes/import/ImportableOldRevisionImporterTest.php b/tests/phpunit/includes/import/ImportableOldRevisionImporterTest.php
	index ed064e19ed9..0bd497f5584 100644
	--- a/tests/phpunit/includes/import/ImportableOldRevisionImporterTest.php
	+++ b/tests/phpunit/includes/import/ImportableOldRevisionImporterTest.php
	@@ -1,6 +1,8 @@
	<?php

	use MediaWiki\Content\ContentHandler;
	+use MediaWiki\Exception\MWContentSerializationException;
	+use MediaWiki\Exception\MWUnknownContentModelException;
	use MediaWiki\Page\Event\PageRevisionUpdatedEvent;
	use MediaWiki\Page\PageIdentity;
	use MediaWiki\Page\PageIdentityValue;
	@@ -12,6 +14,7 @@ use MediaWiki\Tests\ResourceLoader\ResourceLoaderUpdateSpyTrait;
	use MediaWiki\Tests\Search\SearchUpdateSpyTrait;
	use MediaWiki\Tests\User\TempUser\TempUserTestTrait;
	use MediaWiki\Title\Title;
	+use MediaWiki\Utils\MWTimestamp;
	use PHPUnit\Framework\Assert;
	use Psr\Log\NullLogger;

	diff --git a/tests/phpunit/includes/jobqueue/JobFactoryTest.php b/tests/phpunit/includes/jobqueue/JobFactoryTest.php
	index cf6c01d78db..388f4a84233 100644
	--- a/tests/phpunit/includes/jobqueue/JobFactoryTest.php
	+++ b/tests/phpunit/includes/jobqueue/JobFactoryTest.php
	@@ -1,6 +1,7 @@
	<?php

	use MediaWiki\JobQueue\JobFactory;
	+use MediaWiki\JobQueue\Jobs\DeleteLinksJob;
	use MediaWiki\JobQueue\Jobs\NullJob;
	use MediaWiki\JobQueue\Jobs\ParsoidCachePrewarmJob;
	use MediaWiki\Title\Title;
	diff --git a/tests/phpunit/includes/jobqueue/JobTest.php b/tests/phpunit/includes/jobqueue/JobTest.php
	index deee97bf8eb..51885288c2e 100644
	--- a/tests/phpunit/includes/jobqueue/JobTest.php
	+++ b/tests/phpunit/includes/jobqueue/JobTest.php
	@@ -2,6 +2,7 @@

	use MediaWiki\JobQueue\IJobSpecification;
	use MediaWiki\JobQueue\Job;
	+use MediaWiki\JobQueue\Jobs\DeleteLinksJob;
	use MediaWiki\JobQueue\Jobs\NullJob;
	use MediaWiki\JobQueue\Jobs\ParsoidCachePrewarmJob;
	use MediaWiki\JobQueue\Jobs\RefreshLinksJob;
	diff --git a/tests/phpunit/includes/jobqueue/RefreshLinksPartitionTest.php b/tests/phpunit/includes/jobqueue/RefreshLinksPartitionTest.php
	index 9ca8a6653b7..28d7a65b115 100644
	--- a/tests/phpunit/includes/jobqueue/RefreshLinksPartitionTest.php
	+++ b/tests/phpunit/includes/jobqueue/RefreshLinksPartitionTest.php
	@@ -1,5 +1,6 @@
	<?php

	+use MediaWiki\JobQueue\Job;
	use MediaWiki\JobQueue\Jobs\RefreshLinksJob;
	use MediaWiki\JobQueue\Utils\BacklinkJobUtils;
	use MediaWiki\Title\Title;
	diff --git a/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php b/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php
	index b1d8abaa392..e072ad5ef65 100644
	--- a/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php
	+++ b/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php
	@@ -2,6 +2,7 @@

	use MediaWiki\JobQueue\Jobs\CategoryMembershipChangeJob;
	use MediaWiki\MainConfigNames;
	+use MediaWiki\RecentChanges\RecentChange;
	use MediaWiki\Revision\RevisionRecord;
	use MediaWiki\Title\Title;
	use MediaWiki\Utils\MWTimestamp;
	diff --git a/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php b/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php
	index 84e4cc63c1d..c60ff6feaff 100644
	--- a/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php
	+++ b/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php
	@@ -5,6 +5,7 @@ use MediaWiki\Content\Content;
	use MediaWiki\Content\WikitextContent;
	use MediaWiki\JobQueue\Jobs\RefreshLinksJob;
	use MediaWiki\Page\PageAssertionException;
	+use MediaWiki\Page\WikiPage;
	use MediaWiki\Title\Title;
	use Wikimedia\Rdbms\Platform\ISQLPlatform;
	use Wikimedia\Stats\StatsFactory;
	diff --git a/tests/phpunit/includes/language/MessageParserTest.php b/tests/phpunit/includes/language/MessageParserTest.php
	index 41436ca6ff6..f36a1d9b8c8 100644
	--- a/tests/phpunit/includes/language/MessageParserTest.php
	+++ b/tests/phpunit/includes/language/MessageParserTest.php
	@@ -3,6 +3,7 @@
	use MediaWiki\DAO\WikiAwareEntity;
	use MediaWiki\Language\RawMessage;
	use MediaWiki\Page\PageIdentityValue;
	+use MediaWiki\Parser\Parser;

	/**
	* @covers MediaWiki\Language\MessageParser
	diff --git a/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php b/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php
	index 3b7d9c68934..6eb688b88dc 100644
	--- a/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php
	+++ b/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php
	@@ -2,6 +2,7 @@

	use MediaWiki\Context\DerivativeContext;
	use MediaWiki\Context\RequestContext;
	+use MediaWiki\Exception\HttpError;
	use MediaWiki\LinkedData\PageDataRequestHandler;
	use MediaWiki\Output\OutputPage;
	use MediaWiki\Request\FauxRequest;
	diff --git a/tests/phpunit/includes/logging/LogFormatterTest.php b/tests/phpunit/includes/logging/LogFormatterTest.php
	index 1b7aa6274d8..49b6aece380 100644
	--- a/tests/phpunit/includes/logging/LogFormatterTest.php
	+++ b/tests/phpunit/includes/logging/LogFormatterTest.php
	@@ -6,6 +6,7 @@ use MediaWiki\Context\RequestContext;
	use MediaWiki\Linker\Linker;
	use MediaWiki\Logging\LogFormatter;
	use MediaWiki\Logging\LogPage;
	+use MediaWiki\Logging\ManualLogEntry;
	use MediaWiki\MainConfigNames;
	use MediaWiki\Message\Message;
	use MediaWiki\Permissions\SimpleAuthority;
	diff --git a/tests/phpunit/includes/mail/EmailNotificationTest.php b/tests/phpunit/includes/mail/EmailNotificationTest.php
	index 70061b93da8..b5091d0ba50 100644
	--- a/tests/phpunit/includes/mail/EmailNotificationTest.php
	+++ b/tests/phpunit/includes/mail/EmailNotificationTest.php
	@@ -1,6 +1,7 @@
	<?php

	use MediaWiki\MainConfigNames;
	+use MediaWiki\RecentChanges\RecentChange;
	use MediaWiki\Title\Title;

	/**
	diff --git a/tests/phpunit/includes/media/ExifRotationTest.php b/tests/phpunit/includes/media/ExifRotationTest.php
	index 94bea31ca9b..f6ddc2eef15 100644
	--- a/tests/phpunit/includes/media/ExifRotationTest.php
	+++ b/tests/phpunit/includes/media/ExifRotationTest.php
	@@ -1,5 +1,6 @@
	<?php

	+use MediaWiki\FileRepo\File\File;
	use MediaWiki\MainConfigNames;

	/**
	diff --git a/tests/phpunit/includes/media/FakeDimensionFile.php b/tests/phpunit/includes/media/FakeDimensionFile.php
	index 077858df86d..892cc1323e4 100644
	--- a/tests/phpunit/includes/media/FakeDimensionFile.php
	+++ b/tests/phpunit/includes/media/FakeDimensionFile.php
	@@ -1,5 +1,7 @@
	<?php

	+use MediaWiki\FileRepo\File\File;
	+use MediaWiki\FileRepo\NullRepo;
	use MediaWiki\Title\Title;

	class FakeDimensionFile extends File {
	diff --git a/tests/phpunit/includes/media/FormatMetadataTest.php b/tests/phpunit/includes/media/FormatMetadataTest.php
	index f42397b2d7f..ccb351d42e5 100644
	--- a/tests/phpunit/includes/media/FormatMetadataTest.php
	+++ b/tests/phpunit/includes/media/FormatMetadataTest.php
	@@ -20,7 +20,7 @@ class FormatMetadataTest extends MediaWikiMediaTestCase {
	}

	/**
	- * @covers \File::formatMetadata
	+ * @covers \MediaWiki\FileRepo\File\File::formatMetadata
	*/
	public function testInvalidDate() {
	$file = $this->dataFile( 'broken_exif_date.jpg', 'image/jpeg' );
	diff --git a/tests/phpunit/includes/media/JpegPixelFormatTest.php b/tests/phpunit/includes/media/JpegPixelFormatTest.php
	index 2541b3efbe4..44c1cacf8de 100644
	--- a/tests/phpunit/includes/media/JpegPixelFormatTest.php
	+++ b/tests/phpunit/includes/media/JpegPixelFormatTest.php
	@@ -1,5 +1,6 @@
	<?php

	+use MediaWiki\FileRepo\File\File;
	use MediaWiki\MainConfigNames;
	use MediaWiki\Shell\Shell;

	diff --git a/tests/phpunit/includes/media/MediaWikiMediaTestCase.php b/tests/phpunit/includes/media/MediaWikiMediaTestCase.php
	index ad967ac00a3..e79559e30f6 100644
	--- a/tests/phpunit/includes/media/MediaWikiMediaTestCase.php
	+++ b/tests/phpunit/includes/media/MediaWikiMediaTestCase.php
	@@ -1,5 +1,8 @@
	<?php

	+use MediaWiki\FileRepo\File\LocalFile;
	+use MediaWiki\FileRepo\File\UnregisteredLocalFile;
	+use MediaWiki\FileRepo\FileRepo;
	use MediaWiki\WikiMap\WikiMap;
	use Wikimedia\FileBackend\FSFileBackend;

	diff --git a/tests/phpunit/includes/media/SvgHandlerTest.php b/tests/phpunit/includes/media/SvgHandlerTest.php
	index 3e69d5c9194..e3cba4bc5a9 100644
	--- a/tests/phpunit/includes/media/SvgHandlerTest.php
	+++ b/tests/phpunit/includes/media/SvgHandlerTest.php
	@@ -1,5 +1,6 @@
	<?php

	+use MediaWiki\FileRepo\File\File;
	use MediaWiki\MainConfigNames;
	use Wikimedia\TestingAccessWrapper;

	diff --git a/tests/phpunit/includes/media/ThumbnailImageTest.php b/tests/phpunit/includes/media/ThumbnailImageTest.php
	index 2af64346865..127e1ab449d 100644
	--- a/tests/phpunit/includes/media/ThumbnailImageTest.php
	+++ b/tests/phpunit/includes/media/ThumbnailImageTest.php
	@@ -1,5 +1,7 @@
	<?php

	+use MediaWiki\FileRepo\File\UnregisteredLocalFile;
	+use MediaWiki\FileRepo\FileRepo;
	use Wikimedia\FileBackend\FileBackend;

	/**
	diff --git a/tests/phpunit/includes/page/ArticleViewTest.php b/tests/phpunit/includes/page/ArticleViewTest.php
	index 65e74283897..3a1cf87bc0c 100644
	--- a/tests/phpunit/includes/page/ArticleViewTest.php
	+++ b/tests/phpunit/includes/page/ArticleViewTest.php
	@@ -10,6 +10,7 @@ use MediaWiki\MainConfigNames;
	use MediaWiki\Output\OutputPage;
	use MediaWiki\Page\Article;
	use MediaWiki\Page\WikiPage;
	+use MediaWiki\Parser\ParserOptions;
	use MediaWiki\Parser\ParserOutput;
	use MediaWiki\Request\FauxRequest;
	use MediaWiki\Revision\MutableRevisionRecord;
	diff --git a/tests/phpunit/includes/page/MovePageTest.php b/tests/phpunit/includes/page/MovePageTest.php
	index 07aaf63a09f..d8fabf3f2b5 100644
	--- a/tests/phpunit/includes/page/MovePageTest.php
	+++ b/tests/phpunit/includes/page/MovePageTest.php
	@@ -1,6 +1,8 @@
	<?php

	use MediaWiki\Config\ServiceOptions;
	+use MediaWiki\Content\Content;
	+use MediaWiki\Content\JavaScriptContent;
	use MediaWiki\Content\WikitextContent;
	use MediaWiki\Interwiki\InterwikiLookup;
	use MediaWiki\MainConfigNames;
	diff --git a/tests/phpunit/includes/page/UndeletePageTest.php b/tests/phpunit/includes/page/UndeletePageTest.php
	index 7fe557b77f5..2fbf2aba765 100644
	--- a/tests/phpunit/includes/page/UndeletePageTest.php
	+++ b/tests/phpunit/includes/page/UndeletePageTest.php
	@@ -17,6 +17,7 @@ use MediaWiki\Tests\Search\SearchUpdateSpyTrait;
	use MediaWiki\Tests\User\TempUser\TempUserTestTrait;
	use MediaWiki\Title\Title;
	use MediaWiki\User\UserIdentityValue;
	+use MediaWiki\Utils\MWTimestamp;
	use PHPUnit\Framework\Assert;
	use Wikimedia\IPUtils;

	diff --git a/tests/phpunit/includes/page/WikiFilePageTest.php b/tests/phpunit/includes/page/WikiFilePageTest.php
	index 43962ef27b0..405d1fadcad 100644
	--- a/tests/phpunit/includes/page/WikiFilePageTest.php
	+++ b/tests/phpunit/includes/page/WikiFilePageTest.php
	@@ -1,5 +1,8 @@
	<?php

	+use MediaWiki\FileRepo\File\File;
	+use MediaWiki\FileRepo\FileRepo;
	+use MediaWiki\FileRepo\RepoGroup;
	use MediaWiki\Linker\LinkTarget;
	use MediaWiki\Page\WikiFilePage;
	use MediaWiki\Title\Title;
	diff --git a/tests/phpunit/includes/pager/HistoryPagerTest.php b/tests/phpunit/includes/pager/HistoryPagerTest.php
	index 94455968de0..342496500fb 100644
	--- a/tests/phpunit/includes/pager/HistoryPagerTest.php
	+++ b/tests/phpunit/includes/pager/HistoryPagerTest.php
	@@ -3,6 +3,8 @@
	use MediaWiki\Actions\HistoryAction;
	use MediaWiki\Context\RequestContext;
	use MediaWiki\Output\OutputPage;
	+use MediaWiki\Page\Article;
	+use MediaWiki\Page\WikiPage;
	use MediaWiki\Pager\HistoryPager;
	use MediaWiki\Request\FauxRequest;
	use MediaWiki\Revision\MutableRevisionRecord;
	diff --git a/tests/phpunit/includes/parser/ParserCacheTest.php b/tests/phpunit/includes/parser/ParserCacheTest.php
	index 34bd43cb40d..1ede57b9c21 100644
	--- a/tests/phpunit/includes/parser/ParserCacheTest.php
	+++ b/tests/phpunit/includes/parser/ParserCacheTest.php
	@@ -7,6 +7,7 @@ use MediaWiki\HookContainer\HookContainer;
	use MediaWiki\Json\JsonCodec;
	use MediaWiki\Page\PageRecord;
	use MediaWiki\Page\PageStoreRecord;
	+use MediaWiki\Page\WikiPage;
	use MediaWiki\Page\WikiPageFactory;
	use MediaWiki\Parser\CacheTime;
	use MediaWiki\Parser\ParserCache;
	@@ -29,7 +30,6 @@ use Wikimedia\Stats\StatsFactory;
	use Wikimedia\TestingAccessWrapper;
	use Wikimedia\Timestamp\ConvertibleTimestamp;
	use Wikimedia\UUID\GlobalIdGenerator;
	-use WikiPage;

	/**
	* @covers \MediaWiki\Parser\ParserCache
	diff --git a/tests/phpunit/includes/poolcounter/PoolWorkArticleViewCurrentTest.php b/tests/phpunit/includes/poolcounter/PoolWorkArticleViewCurrentTest.php
	index e183052dc61..c59a679e05a 100644
	--- a/tests/phpunit/includes/poolcounter/PoolWorkArticleViewCurrentTest.php
	+++ b/tests/phpunit/includes/poolcounter/PoolWorkArticleViewCurrentTest.php
	@@ -1,6 +1,7 @@
	<?php

	use MediaWiki\Json\JsonCodec;
	+use MediaWiki\Page\WikiPage;
	use MediaWiki\Parser\ParserCache;
	use MediaWiki\Parser\ParserOptions;
	use MediaWiki\Parser\ParserOutput;
	diff --git a/tests/phpunit/includes/poolcounter/PoolWorkArticleViewOldTest.php b/tests/phpunit/includes/poolcounter/PoolWorkArticleViewOldTest.php
	index d96297cc6cb..a465d96182f 100644
	--- a/tests/phpunit/includes/poolcounter/PoolWorkArticleViewOldTest.php
	+++ b/tests/phpunit/includes/poolcounter/PoolWorkArticleViewOldTest.php
	@@ -1,6 +1,7 @@
	<?php

	use MediaWiki\Json\JsonCodec;
	+use MediaWiki\Page\WikiPage;
	use MediaWiki\Parser\ParserOptions;
	use MediaWiki\Parser\RevisionOutputCache;
	use MediaWiki\PoolCounter\PoolWorkArticleViewOld;
	diff --git a/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php b/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php
	index 5a7bf4b69e5..79ea042bd31 100644
	--- a/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php
	+++ b/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php
	@@ -3,6 +3,7 @@
	use MediaWiki\CommentStore\CommentStoreComment;
	use MediaWiki\Content\WikitextContent;
	use MediaWiki\Logger\Spi as LoggerSpi;
	+use MediaWiki\Page\WikiPage;
	use MediaWiki\Parser\ParserOptions;
	use MediaWiki\PoolCounter\PoolWorkArticleView;
	use MediaWiki\Revision\MutableRevisionRecord;
	diff --git a/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php b/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
	index f0bcac878a2..d118a00c6f0 100644
	--- a/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
	+++ b/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
	@@ -20,6 +20,8 @@ use MediaWiki\Preferences\DefaultPreferencesFactory;
	use MediaWiki\Preferences\SignatureValidatorFactory;
	use MediaWiki\Request\FauxRequest;
	use MediaWiki\Session\SessionId;
	+use MediaWiki\Skin\Skin;
	+use MediaWiki\Skin\SkinFactory;
	use MediaWiki\Tests\Session\TestUtils;
	use MediaWiki\Tests\Unit\DummyServicesTrait;
	use MediaWiki\Title\NamespaceInfo;
	diff --git a/tests/phpunit/includes/recentchanges/CategoryMembershipChangeTest.php b/tests/phpunit/includes/recentchanges/CategoryMembershipChangeTest.php
	index 958af130302..fcc1597cf0e 100644
	--- a/tests/phpunit/includes/recentchanges/CategoryMembershipChangeTest.php
	+++ b/tests/phpunit/includes/recentchanges/CategoryMembershipChangeTest.php
	@@ -1,5 +1,7 @@
	<?php

	+use MediaWiki\RecentChanges\CategoryMembershipChange;
	+use MediaWiki\RecentChanges\RecentChange;
	use MediaWiki\Revision\RevisionRecord;
	use MediaWiki\Title\Title;
	use MediaWiki\User\UserIdentity;
	diff --git a/tests/phpunit/includes/recentchanges/ChangesListTest.php b/tests/phpunit/includes/recentchanges/ChangesListTest.php
	index f4a84ce669a..3eb17d42f91 100644
	--- a/tests/phpunit/includes/recentchanges/ChangesListTest.php
	+++ b/tests/phpunit/includes/recentchanges/ChangesListTest.php
	@@ -1,6 +1,8 @@
	<?php

	+use MediaWiki\Context\IContextSource;
	use MediaWiki\Logging\DatabaseLogEntry;
	+use MediaWiki\RecentChanges\ChangesList;
	use MediaWiki\User\UserIdentity;
	use Wikimedia\Parsoid\Utils\DOMCompat;
	use Wikimedia\Parsoid\Utils\DOMUtils;
	diff --git a/tests/phpunit/includes/recentchanges/EnhancedChangesListTest.php b/tests/phpunit/includes/recentchanges/EnhancedChangesListTest.php
	index 62f20ce0004..8ec1cb4db67 100644
	--- a/tests/phpunit/includes/recentchanges/EnhancedChangesListTest.php
	+++ b/tests/phpunit/includes/recentchanges/EnhancedChangesListTest.php
	@@ -2,6 +2,8 @@

	use MediaWiki\Content\WikitextContent;
	use MediaWiki\Context\RequestContext;
	+use MediaWiki\RecentChanges\EnhancedChangesList;
	+use MediaWiki\RecentChanges\RecentChange;
	use MediaWiki\Title\Title;
	use MediaWiki\User\User;
	use MediaWiki\Utils\MWTimestamp;
	diff --git a/tests/phpunit/includes/recentchanges/OldChangesListTest.php b/tests/phpunit/includes/recentchanges/OldChangesListTest.php
	index 731fab0faba..057acd81336 100644
	--- a/tests/phpunit/includes/recentchanges/OldChangesListTest.php
	+++ b/tests/phpunit/includes/recentchanges/OldChangesListTest.php
	@@ -1,6 +1,7 @@
	<?php

	use MediaWiki\Context\RequestContext;
	+use MediaWiki\RecentChanges\OldChangesList;
	use MediaWiki\Title\Title;

	/**
	diff --git a/tests/phpunit/includes/recentchanges/RCCacheEntryFactoryTest.php b/tests/phpunit/includes/recentchanges/RCCacheEntryFactoryTest.php
	index bd72e1440f8..c004901c3f0 100644
	--- a/tests/phpunit/includes/recentchanges/RCCacheEntryFactoryTest.php
	+++ b/tests/phpunit/includes/recentchanges/RCCacheEntryFactoryTest.php
	@@ -2,6 +2,8 @@

	use MediaWiki\Linker\LinkRenderer;
	use MediaWiki\Linker\UserLinkRenderer;
	+use MediaWiki\RecentChanges\RCCacheEntry;
	+use MediaWiki\RecentChanges\RCCacheEntryFactory;
	use MediaWiki\Title\Title;

	/**
	diff --git a/tests/phpunit/includes/recentchanges/RecentChangeTest.php b/tests/phpunit/includes/recentchanges/RecentChangeTest.php
	index ce57b576ec7..4788f156c35 100644
	--- a/tests/phpunit/includes/recentchanges/RecentChangeTest.php
	+++ b/tests/phpunit/includes/recentchanges/RecentChangeTest.php
	@@ -7,6 +7,7 @@ use MediaWiki\Page\PageProps;
	use MediaWiki\Page\PageReference;
	use MediaWiki\Page\PageReferenceValue;
	use MediaWiki\Permissions\PermissionStatus;
	+use MediaWiki\RecentChanges\RecentChange;
	use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
	use MediaWiki\Tests\User\TempUser\TempUserTestTrait;
	use MediaWiki\Title\Title;
	diff --git a/tests/phpunit/includes/recentchanges/RecentChangesUpdateJobTest.php b/tests/phpunit/includes/recentchanges/RecentChangesUpdateJobTest.php
	index d67f1f98f24..2be0e2682ee 100644
	--- a/tests/phpunit/includes/recentchanges/RecentChangesUpdateJobTest.php
	+++ b/tests/phpunit/includes/recentchanges/RecentChangesUpdateJobTest.php
	@@ -1,6 +1,8 @@
	<?php

	use MediaWiki\MainConfigNames;
	+use MediaWiki\RecentChanges\RecentChange;
	+use MediaWiki\RecentChanges\RecentChangesUpdateJob;
	use Wikimedia\Timestamp\ConvertibleTimestamp;

	/**
	diff --git a/tests/phpunit/includes/recentchanges/TestRecentChangesHelper.php b/tests/phpunit/includes/recentchanges/TestRecentChangesHelper.php
	index 3ef61f3d721..cc19e13992f 100644
	--- a/tests/phpunit/includes/recentchanges/TestRecentChangesHelper.php
	+++ b/tests/phpunit/includes/recentchanges/TestRecentChangesHelper.php
	@@ -2,7 +2,10 @@

	use MediaWiki\Context\RequestContext;
	use MediaWiki\MediaWikiServices;
	+use MediaWiki\RecentChanges\RCCacheEntryFactory;
	+use MediaWiki\RecentChanges\RecentChange;
	use MediaWiki\Title\Title;
	+use MediaWiki\User\User;
	use MediaWiki\User\UserIdentity;

	/**
	diff --git a/tests/phpunit/includes/recentchanges/rcfeed/RCFeedIntegrationTest.php b/tests/phpunit/includes/recentchanges/rcfeed/RCFeedIntegrationTest.php
	index 560ae400c39..751b6bf07bb 100644
	--- a/tests/phpunit/includes/recentchanges/rcfeed/RCFeedIntegrationTest.php
	+++ b/tests/phpunit/includes/recentchanges/rcfeed/RCFeedIntegrationTest.php
	@@ -4,6 +4,7 @@ use MediaWiki\Logging\LogEntryBase;
	use MediaWiki\MainConfigNames;
	use MediaWiki\RCFeed\FormattedRCFeed;
	use MediaWiki\RCFeed\JSONRCFeedFormatter;
	+use MediaWiki\RecentChanges\RecentChange;
	use MediaWiki\SpecialPage\SpecialPage;
	use MediaWiki\Title\Title;

	diff --git a/tests/phpunit/includes/skins/SideBarTest.php b/tests/phpunit/includes/skins/SideBarTest.php
	index a1645b14b46..80a60fa93f5 100644
	--- a/tests/phpunit/includes/skins/SideBarTest.php
	+++ b/tests/phpunit/includes/skins/SideBarTest.php
	@@ -2,11 +2,12 @@

	use MediaWiki\MainConfigNames;
	use MediaWiki\MediaWikiServices;
	+use MediaWiki\Skin\SkinTemplate;
	use MediaWiki\Title\Title;

	/**
	- * @covers \Skin
	- * @covers \SkinTemplate
	+ * @covers \MediaWiki\Skin\Skin
	+ * @covers \MediaWiki\Skin\SkinTemplate
	* @group Skin
	* @group Database
	*/
	diff --git a/tests/phpunit/includes/skins/SkinMustacheTest.php b/tests/phpunit/includes/skins/SkinMustacheTest.php
	index f5d879d38e1..1a2244e3361 100644
	--- a/tests/phpunit/includes/skins/SkinMustacheTest.php
	+++ b/tests/phpunit/includes/skins/SkinMustacheTest.php
	@@ -4,11 +4,12 @@ use MediaWiki\Context\RequestContext;
	use MediaWiki\MainConfigNames;
	use MediaWiki\Output\OutputPage;
	use MediaWiki\Request\ContentSecurityPolicy;
	+use MediaWiki\Skin\SkinMustache;
	use MediaWiki\Title\Title;
	use PHPUnit\Framework\MockObject\MockObject;

	/**
	- * @covers \SkinMustache
	+ * @covers \MediaWiki\Skin\SkinMustache
	* @group Skin
	* @group Database
	*/
	@@ -93,7 +94,7 @@ class SkinMustacheTest extends MediaWikiIntegrationTestCase {
	}

	/**
	- * @covers \Skin
	+ * @covers \MediaWiki\Skin\Skin
	* @covers \MediaWiki\Skin\SkinComponentLogo
	* @covers \MediaWiki\Skin\SkinComponentSearch
	* @covers \MediaWiki\Skin\SkinComponentTableOfContents
	diff --git a/tests/phpunit/includes/skins/SkinTemplateTest.php b/tests/phpunit/includes/skins/SkinTemplateTest.php
	index 7148878b390..d5c0e03f959 100644
	--- a/tests/phpunit/includes/skins/SkinTemplateTest.php
	+++ b/tests/phpunit/includes/skins/SkinTemplateTest.php
	@@ -1,6 +1,10 @@
	<?php

	use MediaWiki\MainConfigNames;
	+use MediaWiki\Skin\BaseTemplate;
	+use MediaWiki\Skin\QuickTemplate;
	+use MediaWiki\Skin\SkinFallback;
	+use MediaWiki\Skin\SkinTemplate;
	use MediaWiki\Title\Title;
	use Wikimedia\TestingAccessWrapper;

	@@ -11,8 +15,8 @@ class SkinQuickTemplateTest extends QuickTemplate {
	}

	/**
	- * @covers \SkinTemplate
	- * @covers \Skin
	+ * @covers \MediaWiki\Skin\SkinTemplate
	+ * @covers \MediaWiki\Skin\Skin
	* @group Skin
	* @group Database
	* @author Bene* < benestar.wikimedia@gmail.com >
	diff --git a/tests/phpunit/includes/skins/SkinTest.php b/tests/phpunit/includes/skins/SkinTest.php
	index 256114e00e5..243036b341e 100644
	--- a/tests/phpunit/includes/skins/SkinTest.php
	+++ b/tests/phpunit/includes/skins/SkinTest.php
	@@ -10,6 +10,8 @@ use MediaWiki\Output\OutputPage;
	use MediaWiki\Page\PageReferenceValue;
	use MediaWiki\Permissions\Authority;
	use MediaWiki\Request\FauxRequest;
	+use MediaWiki\Skin\Skin;
	+use MediaWiki\Skin\SkinFallback;
	use MediaWiki\Tests\Unit\MockBlockTrait;
	use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
	use MediaWiki\Tests\User\TempUser\TempUserTestTrait;
	@@ -20,7 +22,7 @@ use MediaWiki\User\UserIdentityLookup;
	use MediaWiki\User\UserIdentityValue;

	/**
	- * @covers \Skin
	+ * @covers \MediaWiki\Skin\Skin
	* @group Database
	*/
	class SkinTest extends MediaWikiIntegrationTestCase {
	@@ -29,7 +31,7 @@ class SkinTest extends MediaWikiIntegrationTestCase {
	use TempUserTestTrait;

	/**
	- * @covers \Skin
	+ * @covers \MediaWiki\Skin\Skin
	*/
	public function testGetSkinName() {
	$skin = new SkinFallback();
	diff --git a/tests/phpunit/includes/specials/SpecialEditWatchlistTest.php b/tests/phpunit/includes/specials/SpecialEditWatchlistTest.php
	index cad6cc8c06a..c9de8d8ba35 100644
	--- a/tests/phpunit/includes/specials/SpecialEditWatchlistTest.php
	+++ b/tests/phpunit/includes/specials/SpecialEditWatchlistTest.php
	@@ -1,5 +1,6 @@
	<?php

	+use MediaWiki\Exception\UserNotLoggedIn;
	use MediaWiki\SpecialPage\SpecialPage;
	use MediaWiki\Specials\SpecialEditWatchlist;

	diff --git a/tests/phpunit/includes/specials/SpecialMuteTest.php b/tests/phpunit/includes/specials/SpecialMuteTest.php
	index 90c31ffdec4..571ea46c286 100644
	--- a/tests/phpunit/includes/specials/SpecialMuteTest.php
	+++ b/tests/phpunit/includes/specials/SpecialMuteTest.php
	@@ -1,6 +1,7 @@
	<?php

	use MediaWiki\Exception\ErrorPageError;
	+use MediaWiki\Exception\UserNotLoggedIn;
	use MediaWiki\HookContainer\HookContainer;
	use MediaWiki\MainConfigNames;
	use MediaWiki\Request\FauxRequest;
	diff --git a/tests/phpunit/includes/specials/SpecialPageDataTest.php b/tests/phpunit/includes/specials/SpecialPageDataTest.php
	index e2f6371a378..e43b6a83517 100644
	--- a/tests/phpunit/includes/specials/SpecialPageDataTest.php
	+++ b/tests/phpunit/includes/specials/SpecialPageDataTest.php
	@@ -1,5 +1,6 @@
	<?php

	+use MediaWiki\Exception\HttpError;
	use MediaWiki\LinkedData\PageDataRequestHandler;
	use MediaWiki\Output\OutputPage;
	use MediaWiki\Request\FauxRequest;
	diff --git a/tests/phpunit/includes/specials/SpecialUnblockTest.php b/tests/phpunit/includes/specials/SpecialUnblockTest.php
	index fe9642dde39..22536fbce6d 100644
	--- a/tests/phpunit/includes/specials/SpecialUnblockTest.php
	+++ b/tests/phpunit/includes/specials/SpecialUnblockTest.php
	@@ -1,6 +1,7 @@
	<?php

	use MediaWiki\Block\DatabaseBlock;
	+use MediaWiki\Exception\ReadOnlyError;
	use MediaWiki\MainConfigNames;
	use MediaWiki\Request\FauxRequest;
	use MediaWiki\Specials\SpecialUnblock;
	diff --git a/tests/phpunit/includes/specials/SpecialWatchlistTest.php b/tests/phpunit/includes/specials/SpecialWatchlistTest.php
	index 3166e865f48..dee39f2506b 100644
	--- a/tests/phpunit/includes/specials/SpecialWatchlistTest.php
	+++ b/tests/phpunit/includes/specials/SpecialWatchlistTest.php
	@@ -1,6 +1,7 @@
	<?php

	use MediaWiki\Context\DerivativeContext;
	+use MediaWiki\Exception\UserNotLoggedIn;
	use MediaWiki\HookContainer\HookContainer;
	use MediaWiki\MainConfigNames;
	use MediaWiki\Request\FauxRequest;
	diff --git a/tests/phpunit/includes/title/NamespaceInfoTest.php b/tests/phpunit/includes/title/NamespaceInfoTest.php
	index ac1e5f76c71..fcb4f3f72bc 100644
	--- a/tests/phpunit/includes/title/NamespaceInfoTest.php
	+++ b/tests/phpunit/includes/title/NamespaceInfoTest.php
	@@ -6,6 +6,7 @@
	*/

	use MediaWiki\Config\ServiceOptions;
	+use MediaWiki\Exception\MWException;
	use MediaWiki\HookContainer\HookContainer;
	use MediaWiki\Linker\LinkTarget;
	use MediaWiki\MainConfigNames;
	diff --git a/tests/phpunit/includes/title/TitleTest.php b/tests/phpunit/includes/title/TitleTest.php
	index d58334a7ecb..1f8a938e6e3 100644
	--- a/tests/phpunit/includes/title/TitleTest.php
	+++ b/tests/phpunit/includes/title/TitleTest.php
	@@ -2,10 +2,12 @@

	use MediaWiki\Cache\BacklinkCache;
	use MediaWiki\Content\WikitextContent;
	+use MediaWiki\Exception\MWException;
	use MediaWiki\Language\RawMessage;
	use MediaWiki\Linker\LinkTarget;
	use MediaWiki\MainConfigNames;
	use MediaWiki\Message\Message;
	+use MediaWiki\Page\Article;
	use MediaWiki\Page\PageIdentity;
	use MediaWiki\Page\PageIdentityValue;
	use MediaWiki\Tests\Unit\DummyServicesTrait;
	diff --git a/tests/phpunit/includes/user/LocalIdLookupTest.php b/tests/phpunit/includes/user/LocalIdLookupTest.php
	index d92e33d8dcd..dd06d6cf6f8 100644
	--- a/tests/phpunit/includes/user/LocalIdLookupTest.php
	+++ b/tests/phpunit/includes/user/LocalIdLookupTest.php
	@@ -7,6 +7,7 @@ use MediaWiki\User\CentralId\CentralIdLookup;
	use MediaWiki\User\CentralId\LocalIdLookup;
	use MediaWiki\User\UserIdentity;
	use MediaWiki\User\UserIdentityValue;
	+use Wikimedia\Rdbms\IDBAccessObject;

	/**
	* @covers \MediaWiki\User\CentralId\LocalIdLookup

File Metadata

Mime Type: text/x-diff
Expires: Sat, Jul 5, 5:31 AM (10 h, 49 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 227398
Default Alt Text: (68 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions