tests: Use namespaced classes (2)

Changes to the use statements done automatically via script
Addition of missing use statement done manually

Change-Id: I4ff4d0c10820dc2a3b8419b4115fadf81a76f7a2

41 files changed, 54 insertions, 10 deletions

diff --git a/tests/phpunit/MediaWikiTestCaseTrait.php b/tests/phpunit/MediaWikiTestCaseTrait.php
index 56aa541bf441..ff13a0f2ba0b 100644
--- a/tests/phpunit/MediaWikiTestCaseTrait.php
+++ b/tests/phpunit/MediaWikiTestCaseTrait.php
@@ -3,6 +3,7 @@
 use MediaWiki\Debug\MWDebug;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\StaticHookRegistry;
+use MediaWiki\Message\Message;
 use PHPUnit\Framework\Constraint\Constraint;
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\MockObject\MockObject;
diff --git a/tests/phpunit/MediaWikiUnitTestCase.php b/tests/phpunit/MediaWikiUnitTestCase.php
index a4b438c997c0..5db2a7c084d3 100644
--- a/tests/phpunit/MediaWikiUnitTestCase.php
+++ b/tests/phpunit/MediaWikiUnitTestCase.php
@@ -20,6 +20,7 @@
  */
 
 use MediaWiki\Config\ConfigException;
+use MediaWiki\Config\HashConfig;
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Deferred\DeferredUpdatesScopeMediaWikiStack;
 use MediaWiki\Deferred\DeferredUpdatesScopeStack;
diff --git a/tests/phpunit/integration/includes/ExtensionJsonTestBase.php b/tests/phpunit/integration/includes/ExtensionJsonTestBase.php
index 78a0405732ec..18edbd5907f4 100644
--- a/tests/phpunit/integration/includes/ExtensionJsonTestBase.php
+++ b/tests/phpunit/integration/includes/ExtensionJsonTestBase.php
@@ -6,7 +6,6 @@ namespace MediaWiki\Tests;
 
 use ApiMain;
 use ApiQuery;
-use ApiTestContext;
 use ContentHandler;
 use MediaWiki\Auth\PreAuthenticationProvider;
 use MediaWiki\Auth\PrimaryAuthenticationProvider;
@@ -14,6 +13,7 @@ use MediaWiki\Auth\SecondaryAuthenticationProvider;
 use MediaWiki\Http\HttpRequestFactory;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Request\FauxRequest;
+use MediaWiki\Tests\Api\ApiTestContext;
 use MediaWikiIntegrationTestCase;
 use Wikimedia\Http\MultiHttpClient;
 use Wikimedia\Rdbms\IDatabase;
diff --git a/tests/phpunit/integration/includes/HTMLForm/HTMLFormFieldTestCase.php b/tests/phpunit/integration/includes/HTMLForm/HTMLFormFieldTestCase.php
index 940250fa4e03..b3aead586dc9 100644
--- a/tests/phpunit/integration/includes/HTMLForm/HTMLFormFieldTestCase.php
+++ b/tests/phpunit/integration/includes/HTMLForm/HTMLFormFieldTestCase.php
@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Tests\Integration\HTMLForm;
 
-use HTMLForm;
 use InvalidArgumentException;
+use MediaWiki\HTMLForm\HTMLForm;
 use MediaWiki\HTMLForm\HTMLFormField;
 use MediaWikiIntegrationTestCase;
 
diff --git a/tests/phpunit/integration/includes/MediaWikiEntryPointTest.php b/tests/phpunit/integration/includes/MediaWikiEntryPointTest.php
index 69304a0b2715..7ab789487e50 100644
--- a/tests/phpunit/integration/includes/MediaWikiEntryPointTest.php
+++ b/tests/phpunit/integration/includes/MediaWikiEntryPointTest.php
@@ -1,11 +1,11 @@
 <?php
 namespace MediaWiki\Tests;
 
+use MediaWiki\Context\RequestContext;
 use MediaWiki\MediaWikiEntryPoint;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Request\FauxRequest;
 use MediaWikiIntegrationTestCase;
-use RequestContext;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/integration/includes/Rest/Handler/HTMLHandlerTestTrait.php b/tests/phpunit/integration/includes/Rest/Handler/HTMLHandlerTestTrait.php
index 78f3164f4756..e244fdf0a374 100644
--- a/tests/phpunit/integration/includes/Rest/Handler/HTMLHandlerTestTrait.php
+++ b/tests/phpunit/integration/includes/Rest/Handler/HTMLHandlerTestTrait.php
@@ -4,8 +4,8 @@ namespace MediaWiki\Tests\Rest\Handler;
 
 use Exception;
 use HashBagOStuff;
-use IContextSource;
 use MediaWiki\Block\BlockErrorFormatter;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Edit\ParsoidOutputStash;
 use MediaWiki\Edit\ParsoidRenderID;
 use MediaWiki\Edit\SimpleParsoidOutputStash;
diff --git a/tests/phpunit/integration/includes/Rest/Handler/ParsoidOutputAccessTest.php b/tests/phpunit/integration/includes/Rest/Handler/ParsoidOutputAccessTest.php
index dcbf7e621abd..331f5f9d4657 100644
--- a/tests/phpunit/integration/includes/Rest/Handler/ParsoidOutputAccessTest.php
+++ b/tests/phpunit/integration/includes/Rest/Handler/ParsoidOutputAccessTest.php
@@ -3,6 +3,7 @@
 use MediaWiki\Content\JavaScriptContent;
 use MediaWiki\Edit\ParsoidRenderID;
 use MediaWiki\Page\ParserOutputAccess;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\ParserOutputFlags;
 use MediaWiki\Parser\Parsoid\PageBundleParserOutputConverter;
 use MediaWiki\Parser\Parsoid\ParsoidOutputAccess;
diff --git a/tests/phpunit/integration/includes/db/DatabaseSqliteUpgradeTest.php b/tests/phpunit/integration/includes/db/DatabaseSqliteUpgradeTest.php
index f0a3996434cd..aead9383c5a1 100644
--- a/tests/phpunit/integration/includes/db/DatabaseSqliteUpgradeTest.php
+++ b/tests/phpunit/integration/includes/db/DatabaseSqliteUpgradeTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Installer\DatabaseUpdater;
 use Psr\Log\NullLogger;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\DatabaseSqlite;
diff --git a/tests/phpunit/integration/includes/libs/filebackend/MemoryFileBackendIntegrationTest.php b/tests/phpunit/integration/includes/libs/filebackend/MemoryFileBackendIntegrationTest.php
index 0bb2cae179b2..5c2aa3ac61d8 100644
--- a/tests/phpunit/integration/includes/libs/filebackend/MemoryFileBackendIntegrationTest.php
+++ b/tests/phpunit/integration/includes/libs/filebackend/MemoryFileBackendIntegrationTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\WikiMap\WikiMap;
+
 /**
  * @group FileBackend
  * @covers MemoryFileBackend
diff --git a/tests/phpunit/integration/includes/parser/Parsoid/Config/SiteConfigTest.php b/tests/phpunit/integration/includes/parser/Parsoid/Config/SiteConfigTest.php
index 6a4b35a26df8..0de04384a8e8 100644
--- a/tests/phpunit/integration/includes/parser/Parsoid/Config/SiteConfigTest.php
+++ b/tests/phpunit/integration/includes/parser/Parsoid/Config/SiteConfigTest.php
@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Tests\Parser\Parsoid\Config;
 
+use MediaWiki\Content\TextContentHandler;
 use MediaWikiIntegrationTestCase;
-use TextContentHandler;
 
 /**
  * @covers \MediaWiki\Parser\Parsoid\Config\SiteConfig
diff --git a/tests/phpunit/integration/includes/revisionlist/RevisionListTest.php b/tests/phpunit/integration/includes/revisionlist/RevisionListTest.php
index 6123e7c4acfe..e378e716be65 100644
--- a/tests/phpunit/integration/includes/revisionlist/RevisionListTest.php
+++ b/tests/phpunit/integration/includes/revisionlist/RevisionListTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\RevisionList\RevisionItem;
diff --git a/tests/phpunit/mocks/MockEnvironment.php b/tests/phpunit/mocks/MockEnvironment.php
index b7a83afebe58..1b0190f98aff 100644
--- a/tests/phpunit/mocks/MockEnvironment.php
+++ b/tests/phpunit/mocks/MockEnvironment.php
@@ -3,12 +3,12 @@
 namespace MediaWiki\Tests;
 
 use Exception;
-use HashConfig;
+use MediaWiki\Config\HashConfig;
+use MediaWiki\Config\MultiConfig;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\EntryPointEnvironment;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Request\FauxResponse;
-use MultiConfig;
 use PHPUnit\Framework\Assert;
 
 /**
diff --git a/tests/phpunit/mocks/MockMessageLocalizer.php b/tests/phpunit/mocks/MockMessageLocalizer.php
index 388dcf0933c9..69aaf502d1d4 100644
--- a/tests/phpunit/mocks/MockMessageLocalizer.php
+++ b/tests/phpunit/mocks/MockMessageLocalizer.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Message\Message;
+
 /**
  * A simple {@link MessageLocalizer} implementation for use in tests.
  * By default, it sets the message language to 'qqx',
diff --git a/tests/phpunit/mocks/MockTitleTrait.php b/tests/phpunit/mocks/MockTitleTrait.php
index 8cb82cd0adde..9898cbfdcc6d 100644
--- a/tests/phpunit/mocks/MockTitleTrait.php
+++ b/tests/phpunit/mocks/MockTitleTrait.php
@@ -4,6 +4,7 @@ use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Page\PageStoreRecord;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleFactory;
 use PHPUnit\Framework\MockObject\MockObject;
 
 /**
diff --git a/tests/phpunit/mocks/content/DummyContentHandlerForTesting.php b/tests/phpunit/mocks/content/DummyContentHandlerForTesting.php
index ad0aafede08b..edd1255312a2 100644
--- a/tests/phpunit/mocks/content/DummyContentHandlerForTesting.php
+++ b/tests/phpunit/mocks/content/DummyContentHandlerForTesting.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Content\Renderer\ContentParseParams;
+use MediaWiki\Parser\ParserOutput;
 
 class DummyContentHandlerForTesting extends ContentHandler {
 
diff --git a/tests/phpunit/mocks/content/DummyNonTextContentHandler.php b/tests/phpunit/mocks/content/DummyNonTextContentHandler.php
index a5482faa48d5..b82fd1d05dc6 100644
--- a/tests/phpunit/mocks/content/DummyNonTextContentHandler.php
+++ b/tests/phpunit/mocks/content/DummyNonTextContentHandler.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Content\Renderer\ContentParseParams;
+use MediaWiki\Parser\ParserOutput;
 
 class DummyNonTextContentHandler extends DummyContentHandlerForTesting {
 
diff --git a/tests/phpunit/mocks/filerepo/TestRepoTrait.php b/tests/phpunit/mocks/filerepo/TestRepoTrait.php
index 4cf36caf1e75..5aa5b8dcd382 100644
--- a/tests/phpunit/mocks/filerepo/TestRepoTrait.php
+++ b/tests/phpunit/mocks/filerepo/TestRepoTrait.php
@@ -8,9 +8,9 @@ use LocalRepo;
 use LogicException;
 use MediaWiki\FileBackend\FileBackendGroup;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Title\Title;
 use PHPUnit\Framework\Assert;
 use RepoGroup;
-use Title;
 use Wikimedia\FileBackend\FileBackend;
 
 trait TestRepoTrait {
diff --git a/tests/phpunit/structure/ApiStructureTest.php b/tests/phpunit/structure/ApiStructureTest.php
index 43a426a66d5a..d8583c89ced2 100644
--- a/tests/phpunit/structure/ApiStructureTest.php
+++ b/tests/phpunit/structure/ApiStructureTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\Context\RequestContext;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Message\Message;
 use MediaWiki\Title\Title;
 use Wikimedia\TestingAccessWrapper;
 
diff --git a/tests/phpunit/structure/ContentHandlerFunctionalTest.php b/tests/phpunit/structure/ContentHandlerFunctionalTest.php
index 4f0e784873f1..f119d6d9b96f 100644
--- a/tests/phpunit/structure/ContentHandlerFunctionalTest.php
+++ b/tests/phpunit/structure/ContentHandlerFunctionalTest.php
@@ -23,6 +23,7 @@ use MediaWiki\Content\TextContentHandler;
 use MediaWiki\Content\Transform\PreloadTransformParamsValue;
 use MediaWiki\Content\Transform\PreSaveTransformParamsValue;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Parser\ParserOutput;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/structure/RestStructureTest.php b/tests/phpunit/structure/RestStructureTest.php
index 4195dc49b8ce..d4f6c3dc827c 100644
--- a/tests/phpunit/structure/RestStructureTest.php
+++ b/tests/phpunit/structure/RestStructureTest.php
@@ -7,6 +7,7 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\StaticHookRegistry;
 use MediaWiki\MainConfigSchema;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Message\Message;
 use MediaWiki\Permissions\SimpleAuthority;
 use MediaWiki\Request\WebRequest;
 use MediaWiki\Rest\CorsUtils;
diff --git a/tests/phpunit/unit/includes/Message/MessageFormatterFactoryTest.php b/tests/phpunit/unit/includes/Message/MessageFormatterFactoryTest.php
index d57ee9719e1f..8680d93b7ab4 100644
--- a/tests/phpunit/unit/includes/Message/MessageFormatterFactoryTest.php
+++ b/tests/phpunit/unit/includes/Message/MessageFormatterFactoryTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Message\Message;
 use MediaWiki\Message\MessageFormatterFactory;
 
 /**
diff --git a/tests/phpunit/unit/includes/actions/ActionFactoryTest.php b/tests/phpunit/unit/includes/actions/ActionFactoryTest.php
index 8422a8ac035d..2e3770b7f523 100644
--- a/tests/phpunit/unit/includes/actions/ActionFactoryTest.php
+++ b/tests/phpunit/unit/includes/actions/ActionFactoryTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Actions\ActionFactory;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\Title\Title;
diff --git a/tests/phpunit/unit/includes/auth/AuthenticationResponseTest.php b/tests/phpunit/unit/includes/auth/AuthenticationResponseTest.php
index 75ae450f6942..c9b3faec1b4b 100644
--- a/tests/phpunit/unit/includes/auth/AuthenticationResponseTest.php
+++ b/tests/phpunit/unit/includes/auth/AuthenticationResponseTest.php
@@ -6,8 +6,8 @@ use Exception;
 use InvalidArgumentException;
 use MediaWiki\Auth\AuthenticationRequest;
 use MediaWiki\Auth\AuthenticationResponse;
+use MediaWiki\Message\Message;
 use MediaWikiUnitTestCase;
-use Message;
 
 /**
  * @group AuthManager
diff --git a/tests/phpunit/unit/includes/changes/ChangesListStringOptionsFilterGroupTest.php b/tests/phpunit/unit/includes/changes/ChangesListStringOptionsFilterGroupTest.php
index cfbd291b27c3..fee91d5c9a00 100644
--- a/tests/phpunit/unit/includes/changes/ChangesListStringOptionsFilterGroupTest.php
+++ b/tests/phpunit/unit/includes/changes/ChangesListStringOptionsFilterGroupTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Html\FormOptions;
 use MediaWiki\SpecialPage\ChangesListSpecialPage;
 use Wikimedia\Rdbms\IDatabase;
diff --git a/tests/phpunit/unit/includes/diff/UnsupportedSlotDiffRendererTest.php b/tests/phpunit/unit/includes/diff/UnsupportedSlotDiffRendererTest.php
index fb77e04cfaf9..bcbc4def6cbb 100644
--- a/tests/phpunit/unit/includes/diff/UnsupportedSlotDiffRendererTest.php
+++ b/tests/phpunit/unit/includes/diff/UnsupportedSlotDiffRendererTest.php
@@ -4,6 +4,7 @@ use MediaWiki\Content\FallbackContent;
 use MediaWiki\Content\FallbackContentHandler;
 use MediaWiki\Content\TextContent;
 use MediaWiki\Content\TextContentHandler;
+use MediaWiki\Message\Message;
 
 /**
  * @covers \UnsupportedSlotDiffRenderer
diff --git a/tests/phpunit/unit/includes/editpage/Constraint/EditConstraintFactoryTest.php b/tests/phpunit/unit/includes/editpage/Constraint/EditConstraintFactoryTest.php
index a9be685c080b..e66a69b545b2 100644
--- a/tests/phpunit/unit/includes/editpage/Constraint/EditConstraintFactoryTest.php
+++ b/tests/phpunit/unit/includes/editpage/Constraint/EditConstraintFactoryTest.php
@@ -19,6 +19,7 @@
  */
 
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\EditPage\Constraint\EditConstraintFactory;
 use MediaWiki\EditPage\Constraint\EditFilterMergedContentHookConstraint;
 use MediaWiki\EditPage\Constraint\PageSizeConstraint;
diff --git a/tests/phpunit/unit/includes/exception/HttpErrorTest.php b/tests/phpunit/unit/includes/exception/HttpErrorTest.php
index 15fb317a34b2..e3fc036f840f 100644
--- a/tests/phpunit/unit/includes/exception/HttpErrorTest.php
+++ b/tests/phpunit/unit/includes/exception/HttpErrorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Message\Message;
+
 /**
  * @todo tests for HttpError::report
  *
diff --git a/tests/phpunit/unit/includes/filebackend/HTTPFileStreamerTest.php b/tests/phpunit/unit/includes/filebackend/HTTPFileStreamerTest.php
index 68729c99b746..7c1750d68c6d 100644
--- a/tests/phpunit/unit/includes/filebackend/HTTPFileStreamerTest.php
+++ b/tests/phpunit/unit/includes/filebackend/HTTPFileStreamerTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Utils\MWTimestamp;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/tests/phpunit/unit/includes/htmlform/HTMLCheckMatrixTest.php b/tests/phpunit/unit/includes/htmlform/HTMLCheckMatrixTest.php
index a858ba9b5ec5..b8a3f46ef38d 100644
--- a/tests/phpunit/unit/includes/htmlform/HTMLCheckMatrixTest.php
+++ b/tests/phpunit/unit/includes/htmlform/HTMLCheckMatrixTest.php
@@ -4,6 +4,7 @@ use MediaWiki\HTMLForm\Field\HTMLCheckMatrix;
 use MediaWiki\HTMLForm\HTMLForm;
 use MediaWiki\HTMLForm\HTMLFormField;
 use MediaWiki\HTMLForm\HTMLFormFieldRequiredOptionsException;
+use MediaWiki\Message\Message;
 
 /**
  * @covers \HTMLCheckMatrix
diff --git a/tests/phpunit/unit/includes/language/FormatterFactoryTest.php b/tests/phpunit/unit/includes/language/FormatterFactoryTest.php
index a6c69de29991..c49a9b79c71e 100644
--- a/tests/phpunit/unit/includes/language/FormatterFactoryTest.php
+++ b/tests/phpunit/unit/includes/language/FormatterFactoryTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Context\IContextSource;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Language\FormatterFactory;
 use MediaWiki\Languages\LanguageFactory;
diff --git a/tests/phpunit/unit/includes/parser/ParserObserverTest.php b/tests/phpunit/unit/includes/parser/ParserObserverTest.php
index 4b3479b14162..8f978b45f534 100644
--- a/tests/phpunit/unit/includes/parser/ParserObserverTest.php
+++ b/tests/phpunit/unit/includes/parser/ParserObserverTest.php
@@ -4,10 +4,10 @@ namespace MediaWiki\Tests\Parser;
 
 use DummyContentForTesting;
 use MediaWiki\Parser\ParserObserver;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Title\Title;
 use MediaWikiUnitTestCase;
 use ParserOptions;
-use ParserOutput;
 use TestLogger;
 
 /**
diff --git a/tests/phpunit/unit/includes/password/BcryptPasswordTest.php b/tests/phpunit/unit/includes/password/BcryptPasswordTest.php
index 020cbb3f8d53..cd601b2fc010 100644
--- a/tests/phpunit/unit/includes/password/BcryptPasswordTest.php
+++ b/tests/phpunit/unit/includes/password/BcryptPasswordTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Password\BcryptPassword;
+
 /**
  * @group large
  * @covers \MediaWiki\Password\BcryptPassword
diff --git a/tests/phpunit/unit/includes/password/EncryptedPasswordTest.php b/tests/phpunit/unit/includes/password/EncryptedPasswordTest.php
index 41f6b5a1bef9..3dfeb3ca7ae8 100644
--- a/tests/phpunit/unit/includes/password/EncryptedPasswordTest.php
+++ b/tests/phpunit/unit/includes/password/EncryptedPasswordTest.php
@@ -1,6 +1,8 @@
 <?php
 
+use MediaWiki\Password\EncryptedPassword;
 use MediaWiki\Password\PasswordError;
+use MediaWiki\Password\Pbkdf2PasswordUsingHashExtension;
 
 /**
  * @covers \Mediawiki\Password\EncryptedPassword
diff --git a/tests/phpunit/unit/includes/password/LayeredParameterizedPasswordTest.php b/tests/phpunit/unit/includes/password/LayeredParameterizedPasswordTest.php
index f59509badb01..7512a1e1ae40 100644
--- a/tests/phpunit/unit/includes/password/LayeredParameterizedPasswordTest.php
+++ b/tests/phpunit/unit/includes/password/LayeredParameterizedPasswordTest.php
@@ -1,6 +1,9 @@
 <?php
 
+use MediaWiki\Password\BcryptPassword;
 use MediaWiki\Password\LayeredParameterizedPassword;
+use MediaWiki\Password\ParameterizedPassword;
+use MediaWiki\Password\Pbkdf2PasswordUsingHashExtension;
 
 /**
  * @covers \MediaWiki\Password\LayeredParameterizedPassword
diff --git a/tests/phpunit/unit/includes/password/PasswordFactoryTest.php b/tests/phpunit/unit/includes/password/PasswordFactoryTest.php
index 49bade4f5362..f0f1f9594559 100644
--- a/tests/phpunit/unit/includes/password/PasswordFactoryTest.php
+++ b/tests/phpunit/unit/includes/password/PasswordFactoryTest.php
@@ -2,6 +2,9 @@
 
 use MediaWiki\Config\HashConfig;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Password\InvalidPassword;
+use MediaWiki\Password\MWOldPassword;
+use MediaWiki\Password\MWSaltedPassword;
 use MediaWiki\Password\PasswordError;
 use MediaWiki\Password\PasswordFactory;
 
diff --git a/tests/phpunit/unit/includes/password/PasswordTest.php b/tests/phpunit/unit/includes/password/PasswordTest.php
index 2225be5ac5ea..04cfe1e0003f 100644
--- a/tests/phpunit/unit/includes/password/PasswordTest.php
+++ b/tests/phpunit/unit/includes/password/PasswordTest.php
@@ -20,6 +20,7 @@
  * @file
  */
 
+use MediaWiki\Password\MWOldPassword;
 use MediaWiki\Password\Password;
 use MediaWiki\Password\PasswordError;
 use MediaWiki\Password\PasswordFactory;
diff --git a/tests/phpunit/unit/includes/password/Pbkdf2PasswordUsingHashExtensionTest.php b/tests/phpunit/unit/includes/password/Pbkdf2PasswordUsingHashExtensionTest.php
index b8ff2afa9674..fab634260148 100644
--- a/tests/phpunit/unit/includes/password/Pbkdf2PasswordUsingHashExtensionTest.php
+++ b/tests/phpunit/unit/includes/password/Pbkdf2PasswordUsingHashExtensionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Password\Pbkdf2PasswordUsingHashExtension;
+
 /**
  * @group large
  * @covers \Mediawiki\Password\AbstractPbkdf2Password
diff --git a/tests/phpunit/unit/includes/password/Pbkdf2PasswordUsingOpenSSLTest.php b/tests/phpunit/unit/includes/password/Pbkdf2PasswordUsingOpenSSLTest.php
index 26fc40eba08b..fe09d82bc445 100644
--- a/tests/phpunit/unit/includes/password/Pbkdf2PasswordUsingOpenSSLTest.php
+++ b/tests/phpunit/unit/includes/password/Pbkdf2PasswordUsingOpenSSLTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Password\Pbkdf2PasswordUsingOpenSSL;
+
 /**
  * @group large
  * @covers \MediaWiki\Password\AbstractPbkdf2Password
diff --git a/tests/phpunit/unit/includes/skins/components/SkinComponentSearchTest.php b/tests/phpunit/unit/includes/skins/components/SkinComponentSearchTest.php
index 5700a62c2bd4..d83e8d1d2fc7 100644
--- a/tests/phpunit/unit/includes/skins/components/SkinComponentSearchTest.php
+++ b/tests/phpunit/unit/includes/skins/components/SkinComponentSearchTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\Config\HashConfig;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Message\Message;
 use MediaWiki\Skin\SkinComponentSearch;
 
 /**
diff --git a/tests/phpunit/unit/includes/specials/formfields/LicensesTest.php b/tests/phpunit/unit/includes/specials/formfields/LicensesTest.php
index fdb06e97053d..cf53a9359c7e 100644
--- a/tests/phpunit/unit/includes/specials/formfields/LicensesTest.php
+++ b/tests/phpunit/unit/includes/specials/formfields/LicensesTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\HTMLForm\HTMLForm;
+
 /**
  * @covers \Licenses
  */
diff --git a/tests/phpunit/unit/tests/MediaWikiUnitTestCaseTest.php b/tests/phpunit/unit/tests/MediaWikiUnitTestCaseTest.php
index 918eff5383c8..21c31be0c5f1 100644
--- a/tests/phpunit/unit/tests/MediaWikiUnitTestCaseTest.php
+++ b/tests/phpunit/unit/tests/MediaWikiUnitTestCaseTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Config\HashConfig;
 use Wikimedia\Services\NoSuchServiceException;
 
 /**