tests: Add more use statements in namespaced classes

Change-Id: I2629cfcb09fde6f18be824779a2c12c013ea0cb5

tests/phpunit/includes/ResourceLoader/ClientHtmlTest.php

@@ -9,13 +9,14 @@ use MediaWiki\ResourceLoader\Context;
 use MediaWiki\ResourceLoader\Module;
 use MediaWiki\ResourceLoader\ResourceLoader;
 use MediaWikiCoversValidator;
+use PHPUnit\Framework\TestCase;
 use Wikimedia\TestingAccessWrapper;
 
 /**
  * @group ResourceLoader
  * @covers \MediaWiki\ResourceLoader\ClientHtml
  */
-class ClientHtmlTest extends \PHPUnit\Framework\TestCase {
+class ClientHtmlTest extends TestCase {
 
 	use MediaWikiCoversValidator;
 

tests/phpunit/includes/ResourceLoader/ContextTest.php

@@ -12,6 +12,8 @@ use MediaWiki\ResourceLoader\Context;
 use MediaWiki\ResourceLoader\ResourceLoader;
 use MediaWiki\User\User;
 use MediaWikiCoversValidator;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
 
 /**
  * See also:
@@ -20,7 +22,7 @@ use MediaWikiCoversValidator;
  * @group ResourceLoader
  * @covers \MediaWiki\ResourceLoader\Context
  */
-class ContextTest extends \PHPUnit\Framework\TestCase {
+class ContextTest extends TestCase {
 
 	use MediaWikiCoversValidator;
 
@@ -62,7 +64,7 @@ class ContextTest extends \PHPUnit\Framework\TestCase {
 		$ctx = new Context( $this->getResourceLoader(), new FauxRequest( [] ) );
 		$this->assertInstanceOf( ResourceLoader::class, $ctx->getResourceLoader() );
 		$this->assertInstanceOf( WebRequest::class, $ctx->getRequest() );
-		$this->assertInstanceOf( \Psr\Log\LoggerInterface::class, $ctx->getLogger() );
+		$this->assertInstanceOf( LoggerInterface::class, $ctx->getLogger() );
 	}
 
 	public function testTypicalRequest() {

tests/phpunit/includes/ResourceLoader/FileModuleTest.php

@@ -5,6 +5,7 @@ namespace MediaWiki\Tests\ResourceLoader;
 use LogicException;
 use MediaWiki\Config\HashConfig;
 use MediaWiki\MainConfigNames;
+use MediaWiki\MediaWikiServices;
 use MediaWiki\ResourceLoader\FileModule;
 use MediaWiki\ResourceLoader\FilePath;
 use MediaWiki\ResourceLoader\ResourceLoader;
@@ -582,7 +583,7 @@ class FileModuleTest extends ResourceLoaderTestCase {
 		$nosemiBScript = file_get_contents( "$basePathB/script-nosemi.js" );
 		$vueComponentDebug = trim( file_get_contents( "$basePath/vue-component-output-debug.js.txt" ) );
 		$vueComponentNonDebug = trim( file_get_contents( "$basePath/vue-component-output-nondebug.js.txt" ) );
-		$config = \MediaWiki\MediaWikiServices::getInstance()->getMainConfig();
+		$config = MediaWikiServices::getInstance()->getMainConfig();
 		return [
 			'plain package' => [
 				$base + [

tests/phpunit/includes/ResourceLoader/MessageBlobStoreTest.php

@@ -6,6 +6,7 @@ use HashBagOStuff;
 use MediaWiki\ResourceLoader\MessageBlobStore;
 use MediaWiki\ResourceLoader\ResourceLoader;
 use MediaWikiCoversValidator;
+use PHPUnit\Framework\TestCase;
 use Psr\Log\NullLogger;
 use WANObjectCache;
 
@@ -13,7 +14,7 @@ use WANObjectCache;
  * @group ResourceLoader
  * @covers \MediaWiki\ResourceLoader\MessageBlobStore
  */
-class MessageBlobStoreTest extends \PHPUnit\Framework\TestCase {
+class MessageBlobStoreTest extends TestCase {
 
 	use MediaWikiCoversValidator;
 

tests/phpunit/includes/ResourceLoader/ResourceEntryPointTest.php

@@ -2,11 +2,13 @@
 
 namespace MediaWiki\Tests\Rest;
 
+use HashBagOStuff;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\ResourceLoader\ResourceEntryPoint;
 use MediaWiki\ResourceLoader\ResourceLoader;
 use MediaWiki\Tests\MockEnvironment;
+use MediaWikiIntegrationTestCase;
 use Psr\Log\NullLogger;
 use Wikimedia\DependencyStore\KeyValueDependencyStore;
 
@@ -14,7 +16,7 @@ use Wikimedia\DependencyStore\KeyValueDependencyStore;
  * @covers \MediaWiki\ResourceLoader\ResourceLoader
  * @group Database
  */
-class ResourceEntryPointTest extends \MediaWikiIntegrationTestCase {
+class ResourceEntryPointTest extends MediaWikiIntegrationTestCase {
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -27,7 +29,7 @@ class ResourceEntryPointTest extends \MediaWikiIntegrationTestCase {
 		$rl = new ResourceLoader(
 			$this->getServiceContainer()->getMainConfig(),
 			new NullLogger(),
-			new KeyValueDependencyStore( new \HashBagOStuff() ),
+			new KeyValueDependencyStore( new HashBagOStuff() ),
 			[
 				'loadScript' => '/w/load.php',
 				'maxageVersioned' => null,

tests/phpunit/includes/ResourceLoader/ResourceLoaderTest.php

@@ -18,6 +18,8 @@ use MediaWiki\ResourceLoader\SkinModule;
 use MediaWiki\ResourceLoader\StartUpModule;
 use MediaWiki\User\Options\StaticUserOptionsLookup;
 use NullStatsdDataFactory;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use RuntimeException;
 use UnexpectedValueException;
 use Wikimedia\Minify\IdentityMinifierState;
@@ -129,7 +131,7 @@ class ResourceLoaderTest extends ResourceLoaderTestCase {
 	}
 
 	public function testRegisterDuplicate() {
-		$logger = $this->createMock( \Psr\Log\LoggerInterface::class );
+		$logger = $this->createMock( LoggerInterface::class );
 		$logger->expects( $this->once() )
 			->method( 'warning' );
 		$resourceLoader = new EmptyResourceLoader( null, $logger );
@@ -837,7 +839,7 @@ END
 		);
 
 		// Disable log from makeModuleResponse via outputErrorAndLog
-		$this->setLogger( 'exception', new \Psr\Log\NullLogger() );
+		$this->setLogger( 'exception', new NullLogger() );
 
 		$response = $rl->makeModuleResponse( $context, $modules );
 		$errors = $rl->getErrors();
@@ -875,7 +877,7 @@ END
 		);
 
 		// Disable log from makeModuleResponse via outputErrorAndLog
-		$this->setLogger( 'exception', new \Psr\Log\NullLogger() );
+		$this->setLogger( 'exception', new NullLogger() );
 
 		$response = $rl->makeModuleResponse( $context, $modules );
 		$errors = $rl->getErrors();
@@ -926,7 +928,7 @@ END
 		);
 
 		// Disable log from makeModuleResponse via outputErrorAndLog
-		$this->setLogger( 'exception', new \Psr\Log\NullLogger() );
+		$this->setLogger( 'exception', new NullLogger() );
 
 		$modules = [ 'startup' => $rl->getModule( 'startup' ) ];
 		$response = $rl->makeModuleResponse( $context, $modules );
@@ -1160,7 +1162,7 @@ END
 			$rl
 		);
 		// Disable logging from outputErrorAndLog
-		$this->setLogger( 'exception', new \Psr\Log\NullLogger() );
+		$this->setLogger( 'exception', new NullLogger() );
 
 		$rl->expects( $this->once() )->method( 'preloadModuleInfo' )
 			->willThrowException( new Exception( 'Preload error' ) );

tests/phpunit/includes/ResourceLoader/StartUpModuleTest.php

@@ -5,6 +5,7 @@ namespace MediaWiki\Tests\ResourceLoader;
 use Exception;
 use MediaWiki\ResourceLoader\Module;
 use MediaWiki\ResourceLoader\StartUpModule;
+use Psr\Log\NullLogger;
 use Wikimedia\Rdbms\ILoadBalancer;
 
 /**
@@ -674,7 +675,7 @@ mw.loader.register([
 
 		// Disable log from getModuleRegistrations via MWExceptionHandler
 		// for case where getVersionHash() is expected to throw.
-		$this->setLogger( 'exception', new \Psr\Log\NullLogger() );
+		$this->setLogger( 'exception', new NullLogger() );
 
 		$this->assertEquals(
 			self::expandPlaceholders( $out ),
@@ -738,7 +739,7 @@ mw.loader.register([
 		$out = ltrim( $case['out'], "\n" );
 
 		// Tolerate exception logs for cases that expect getVersionHash() to throw.
-		$this->setLogger( 'exception', new \Psr\Log\NullLogger() );
+		$this->setLogger( 'exception', new NullLogger() );
 
 		$this->assertEquals(
 			self::expandPlaceholders( $out ),

tests/phpunit/includes/ResourceLoader/UserOptionsModuleTest.php

@@ -4,6 +4,7 @@ namespace MediaWiki\Tests\ResourceLoader;
 
 use MediaWiki\ResourceLoader\Context;
 use MediaWiki\ResourceLoader\UserOptionsModule;
+use MediaWiki\User\Options\StaticUserOptionsLookup;
 use MediaWiki\User\User;
 use MediaWikiIntegrationTestCase;
 
@@ -16,7 +17,7 @@ class UserOptionsModuleTest extends MediaWikiIntegrationTestCase {
 		$module = new UserOptionsModule();
 		$hooks = $this->createHookContainer();
 		$module->setHookContainer( $hooks );
-		$options = new \MediaWiki\User\Options\StaticUserOptionsLookup(
+		$options = new StaticUserOptionsLookup(
 			[
 				'Example1' => [],
 				'Example2' => [ 'y' => '1', 'userjs-extra' => '1' ],
@@ -84,7 +85,7 @@ class UserOptionsModuleTest extends MediaWikiIntegrationTestCase {
 			}
 		] );
 		$module->setHookContainer( $hooks );
-		$options = new \MediaWiki\User\Options\StaticUserOptionsLookup(
+		$options = new StaticUserOptionsLookup(
 			[
 				'User' => [ 'include-explicit' => '1', 'exclude-explicit' => '1' ],
 			],

tests/phpunit/includes/Rest/EntryPointTest.php

@@ -11,12 +11,13 @@ use MediaWiki\Rest\EntryPoint;
 use MediaWiki\Rest\Handler;
 use MediaWiki\Rest\RequestData;
 use MediaWiki\Rest\RequestInterface;
+use MediaWikiIntegrationTestCase;
 
 /**
  * @covers \MediaWiki\Rest\EntryPoint
  * @covers \MediaWiki\Rest\Router
  */
-class EntryPointTest extends \MediaWikiIntegrationTestCase {
+class EntryPointTest extends MediaWikiIntegrationTestCase {
 	use RestTestTrait;
 
 	private function createRouter( RequestInterface $request ) {

tests/phpunit/integration/includes/ResourceLoader/ForeignResourceStructureTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\ResourceLoader\ForeignResourceManager;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Verify MediaWiki core's foreign-resources.yaml.
@@ -10,7 +11,7 @@ use MediaWiki\ResourceLoader\ForeignResourceManager;
  *
  * @coversNothing
  */
-class ForeignResourceStructureTest extends \PHPUnit\Framework\TestCase {
+class ForeignResourceStructureTest extends TestCase {
 
 	public function testVerifyIntegrity() {
 		global $IP;

tests/phpunit/integration/includes/Rest/Handler/HTMLHandlerTestTrait.php

@@ -2,7 +2,9 @@
 
 namespace MediaWiki\Tests\Rest\Handler;
 
+use Exception;
 use HashBagOStuff;
+use IContextSource;
 use MediaWiki\Block\BlockErrorFormatter;
 use MediaWiki\Edit\ParsoidOutputStash;
 use MediaWiki\Edit\ParsoidRenderID;
@@ -36,7 +38,7 @@ trait HTMLHandlerTestTrait {
 		// We need a newly created user because we want IP and newbie to apply.
 			new User(),
 			new FauxRequest(),
-			$this->createMock( \IContextSource::class ),
+			$this->createMock( IContextSource::class ),
 			$services->getPermissionManager(),
 			$services->getRateLimiter(),
 			$this->createMock( BlockErrorFormatter::class )
@@ -49,7 +51,7 @@ trait HTMLHandlerTestTrait {
 	 * @param array $config
 	 *
 	 * @return array
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	private function executePageHTMLRequest(
 		WikiPage $page,
@@ -83,7 +85,7 @@ trait HTMLHandlerTestTrait {
 	 * @param array $config
 	 *
 	 * @return array
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	private function executeRevisionHTMLRequest(
 		int $revId,

tests/phpunit/integration/includes/Rest/Handler/Helper/PageContentHelperTest.php

@@ -2,6 +2,7 @@
 
 namespace MediaWiki\Tests\Rest\Handler\Helper;
 
+use Exception;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\ExistingPageRecord;
@@ -33,7 +34,7 @@ class PageContentHelperTest extends MediaWikiIntegrationTestCase {
 	 * @param array $params
 	 * @param Authority|null $authority
 	 * @return PageContentHelper
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	private function newHelper(
 		array $params = [],

tests/phpunit/integration/includes/Rest/Handler/Helper/RevisionContentHelperTest.php

@@ -2,6 +2,7 @@
 
 namespace MediaWiki\Tests\Rest\Handler\Helper;
 
+use Exception;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\ExistingPageRecord;
@@ -28,7 +29,7 @@ class RevisionContentHelperTest extends MediaWikiIntegrationTestCase {
 	 * @param array $params
 	 * @param Authority|null $authority
 	 * @return RevisionContentHelper
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	private function newHelper(
 		array $params = [],

tests/phpunit/integration/includes/Rest/Handler/LanguageLinksHandlerTest.php

@@ -12,6 +12,7 @@ use MediaWiki\Rest\LocalizedHttpException;
 use MediaWiki\Rest\RequestData;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\Title\Title;
+use MediaWikiIntegrationTestCase;
 use Wikimedia\Message\MessageValue;
 
 /**
@@ -19,7 +20,7 @@ use Wikimedia\Message\MessageValue;
  *
  * @group Database
  */
-class LanguageLinksHandlerTest extends \MediaWikiIntegrationTestCase {
+class LanguageLinksHandlerTest extends MediaWikiIntegrationTestCase {
 	use DummyServicesTrait;
 	use HandlerTestTrait;
 

tests/phpunit/integration/includes/Rest/Handler/MediaFileHandlerTest.php

@@ -8,6 +8,7 @@ use MediaWiki\Rest\Handler\MediaFileHandler;
 use MediaWiki\Rest\LocalizedHttpException;
 use MediaWiki\Rest\RequestData;
 use MediaWiki\Title\Title;
+use MediaWikiLangTestCase;
 use Wikimedia\Message\MessageValue;
 
 /**
@@ -15,7 +16,7 @@ use Wikimedia\Message\MessageValue;
  *
  * @group Database
  */
-class MediaFileHandlerTest extends \MediaWikiLangTestCase {
+class MediaFileHandlerTest extends MediaWikiLangTestCase {
 
 	use MediaTestTrait;
 

tests/phpunit/integration/includes/Rest/Handler/MediaLinksHandlerTest.php

@@ -8,6 +8,7 @@ use MediaWiki\Rest\Handler\MediaLinksHandler;
 use MediaWiki\Rest\LocalizedHttpException;
 use MediaWiki\Rest\RequestData;
 use MediaWiki\Title\Title;
+use MediaWikiIntegrationTestCase;
 use Wikimedia\Message\MessageValue;
 
 /**
@@ -15,7 +16,7 @@ use Wikimedia\Message\MessageValue;
  *
  * @group Database
  */
-class MediaLinksHandlerTest extends \MediaWikiIntegrationTestCase {
+class MediaLinksHandlerTest extends MediaWikiIntegrationTestCase {
 
 	use MediaTestTrait;
 

tests/phpunit/integration/includes/Rest/Handler/UpdateHandlerTest.php

@@ -20,6 +20,7 @@ use MediaWiki\Status\Status;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleFactory;
+use MediaWikiLangTestCase;
 use MockTitleTrait;
 use ParserFactory;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -34,7 +35,7 @@ use WikitextContentHandler;
  * @group Database
  * @covers \MediaWiki\Rest\Handler\UpdateHandler
  */
-class UpdateHandlerTest extends \MediaWikiLangTestCase {
+class UpdateHandlerTest extends MediaWikiLangTestCase {
 	use ActionModuleBasedHandlerTestTrait;
 	use DummyServicesTrait;
 	use MockTitleTrait;

tests/phpunit/unit/includes/Rest/BasicAccess/CompoundAuthorizerTest.php

@@ -7,11 +7,12 @@ use MediaWiki\Rest\BasicAccess\CompoundAuthorizer;
 use MediaWiki\Rest\BasicAccess\StaticBasicAuthorizer;
 use MediaWiki\Rest\Handler;
 use MediaWiki\Rest\RequestInterface;
+use MediaWikiUnitTestCase;
 
 /**
  * @covers \MediaWiki\Rest\BasicAccess\CompoundAuthorizer
  */
-class CompoundAuthorizerTest extends \MediaWikiUnitTestCase {
+class CompoundAuthorizerTest extends MediaWikiUnitTestCase {
 	public static function provideAuthorize() {
 		yield 'No authorizers' => [
 			[], null, null

tests/phpunit/unit/includes/Rest/ConditionalHeaderUtilTest.php

@@ -5,11 +5,12 @@ namespace MediaWiki\Tests\Rest;
 use MediaWiki\Rest\ConditionalHeaderUtil;
 use MediaWiki\Rest\RequestData;
 use MediaWiki\Rest\Response;
+use MediaWikiUnitTestCase;
 
 /**
  * @covers \MediaWiki\Rest\ConditionalHeaderUtil
  */
-class ConditionalHeaderUtilTest extends \MediaWikiUnitTestCase {
+class ConditionalHeaderUtilTest extends MediaWikiUnitTestCase {
 	public static function provider() {
 		return [
 			'nothing' => [

tests/phpunit/unit/includes/Rest/CorsUtilsTest.php

@@ -11,11 +11,12 @@ use MediaWiki\Rest\Response;
 use MediaWiki\Rest\ResponseFactory;
 use MediaWiki\Rest\ResponseInterface;
 use MediaWiki\User\UserIdentityValue;
+use MediaWikiUnitTestCase;
 
 /**
  * @covers \MediaWiki\Rest\CorsUtils
  */
-class CorsUtilsTest extends \MediaWikiUnitTestCase {
+class CorsUtilsTest extends MediaWikiUnitTestCase {
 
 	private function createServiceOptions( array $options = [] ) {
 		$defaults = [

tests/phpunit/unit/includes/Rest/Handler/ActionModuleBasedHandlerTestTrait.php

@@ -71,7 +71,7 @@ trait ActionModuleBasedHandlerTestTrait {
 		// NOTE: This being a MediaWiki\Request\FauxRequest instance triggers special case behavior
 		// in ApiMain, causing ApiMain::isInternalMode() to return true. Among other things,
 		// this causes ApiMain to throw errors rather than encode them in the result data.
-		/** @var MockObject|\MediaWiki\Request\FauxRequest $fauxRequest */
+		/** @var MockObject|FauxRequest $fauxRequest */
 		$fauxRequest = $this->getMockBuilder( FauxRequest::class )
 			->onlyMethods( [ 'getSession', 'getSessionId' ] )
 			->getMock();

tests/phpunit/unit/includes/Rest/Handler/ContributionsCountHandlerTest.php

@@ -9,13 +9,14 @@ use MediaWiki\Rest\RequestInterface;
 use MediaWiki\Revision\ContributionsLookup;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\User\UserIdentityValue;
+use MediaWikiUnitTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Wikimedia\Message\MessageValue;
 
 /**
  * @covers \MediaWiki\Rest\Handler\ContributionsCountHandler
  */
-class ContributionsCountHandlerTest extends \MediaWikiUnitTestCase {
+class ContributionsCountHandlerTest extends MediaWikiUnitTestCase {
 	use DummyServicesTrait;
 	use HandlerTestTrait;
 

tests/phpunit/unit/includes/Rest/Handler/HandlerTest.php

@@ -14,6 +14,7 @@ use MediaWiki\Rest\Router;
 use MediaWiki\Rest\Validator\BodyValidator;
 use MediaWiki\Rest\Validator\Validator;
 use MediaWiki\Session\Session;
+use MediaWikiUnitTestCase;
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\MockObject\MockObject;
 use Wikimedia\Message\MessageValue;
@@ -24,7 +25,7 @@ use Wikimedia\Timestamp\ConvertibleTimestamp;
 /**
  * @covers \MediaWiki\Rest\Handler\SearchHandler
  */
-class HandlerTest extends \MediaWikiUnitTestCase {
+class HandlerTest extends MediaWikiUnitTestCase {
 
 	use HandlerTestTrait;
 

tests/phpunit/unit/includes/Rest/Handler/SearchHandlerTest.php

@@ -27,9 +27,11 @@ use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\Title\TitleFormatter;
 use MediaWiki\Title\TitleValue;
 use MediaWiki\User\Options\UserOptionsLookup;
+use MediaWikiUnitTestCase;
 use MockSearchResultSet;
 use PHPUnit\Framework\MockObject\MockObject;
 use SearchEngine;
+use SearchEngineConfig;
 use SearchEngineFactory;
 use SearchResult;
 use SearchResultSet;
@@ -40,7 +42,7 @@ use Wikimedia\Message\MessageValue;
 /**
  * @covers \MediaWiki\Rest\Handler\SearchHandler
  */
-class SearchHandlerTest extends \MediaWikiUnitTestCase {
+class SearchHandlerTest extends MediaWikiUnitTestCase {
 
 	use DummyServicesTrait;
 	use MediaTestTrait;
@@ -86,7 +88,7 @@ class SearchHandlerTest extends \MediaWikiUnitTestCase {
 		$hookContainer ??= $this->createHookContainer();
 		/** @var UserOptionsLookup|MockObject $userOptionsLookup */
 		$userOptionsLookup = $this->createMock( UserOptionsLookup::class );
-		$searchEngineConfig = new \SearchEngineConfig(
+		$searchEngineConfig = new SearchEngineConfig(
 			$config,
 			$language,
 			$hookContainer,

tests/phpunit/unit/includes/Rest/Handler/UserContributionsHandlerTest.php

@@ -15,6 +15,7 @@ use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;
+use MediaWikiUnitTestCase;
 use MockTitleTrait;
 use PHPUnit\Framework\MockObject\MockObject;
 use Wikimedia\Message\MessageValue;
@@ -22,7 +23,7 @@ use Wikimedia\Message\MessageValue;
 /**
  * @covers \MediaWiki\Rest\Handler\UserContributionsHandler
  */
-class UserContributionsHandlerTest extends \MediaWikiUnitTestCase {
+class UserContributionsHandlerTest extends MediaWikiUnitTestCase {
 	use DummyServicesTrait;
 	use HandlerTestTrait;
 	use MockTitleTrait;

tests/phpunit/unit/includes/Rest/HeaderContainerTest.php

@@ -3,11 +3,12 @@
 namespace MediaWiki\Tests\Rest;
 
 use MediaWiki\Rest\HeaderContainer;
+use MediaWikiUnitTestCase;
 
 /**
  * @covers \MediaWiki\Rest\HeaderContainer
  */
-class HeaderContainerTest extends \MediaWikiUnitTestCase {
+class HeaderContainerTest extends MediaWikiUnitTestCase {
 	public static function provideSetHeader() {
 		return [
 			'simple' => [

tests/phpunit/unit/includes/Rest/HeaderParser/HttpDateTest.php

@@ -3,11 +3,12 @@
 namespace MediaWiki\Tests\Rest\HeaderParser;
 
 use MediaWiki\Rest\HeaderParser\HttpDate;
+use MediaWikiUnitTestCase;
 
 /**
  * @covers \MediaWiki\Rest\HeaderParser\HttpDate
  */
-class HttpDateTest extends \MediaWikiUnitTestCase {
+class HttpDateTest extends MediaWikiUnitTestCase {
 	public static function provideParse() {
 		return [
 			'RFC 7231 example 1' => [

tests/phpunit/unit/includes/Rest/HeaderParser/IfNoneMatchTest.php

@@ -3,11 +3,12 @@
 namespace MediaWiki\Tests\Rest\HeaderParser;
 
 use MediaWiki\Rest\HeaderParser\IfNoneMatch;
+use MediaWikiUnitTestCase;
 
 /**
  * @covers \MediaWiki\Rest\HeaderParser\IfNoneMatch
  */
-class IfNoneMatchTest extends \MediaWikiUnitTestCase {
+class IfNoneMatchTest extends MediaWikiUnitTestCase {
 	public static function provideParseHeaderList() {
 		return [
 			'empty array' => [

tests/phpunit/unit/includes/Rest/PathTemplateMatcher/PathMatcherTest.php

@@ -4,12 +4,13 @@ namespace MediaWiki\Tests\Rest\PathTemplateMatcher;
 
 use MediaWiki\Rest\PathTemplateMatcher\PathConflict;
 use MediaWiki\Rest\PathTemplateMatcher\PathMatcher;
+use MediaWikiUnitTestCase;
 
 /**
  * @covers \MediaWiki\Rest\PathTemplateMatcher\PathMatcher
  * @covers \MediaWiki\Rest\PathTemplateMatcher\PathConflict
  */
-class PathMatcherTest extends \MediaWikiUnitTestCase {
+class PathMatcherTest extends MediaWikiUnitTestCase {
 	private static $normalRoutes = [
 		'/a/b',
 		'/b/{x}',

tests/phpunit/unit/includes/Rest/ResponseFactoryTest.php

@@ -3,6 +3,7 @@
 namespace MediaWiki\Tests\Rest;
 
 use ArrayIterator;
+use Exception;
 use InvalidArgumentException;
 use MediaWiki\Rest\HttpException;
 use MediaWiki\Rest\RedirectException;
@@ -149,7 +150,7 @@ class ResponseFactoryTest extends MediaWikiUnitTestCase {
 
 	public function testCreateFromExceptionLogged() {
 		$rf = $this->createResponseFactory();
-		$response = $rf->createFromException( new \Exception( "hello", 415 ) );
+		$response = $rf->createFromException( new Exception( "hello", 415 ) );
 		$this->assertSame( 500, $response->getStatusCode() );
 		$body = $response->getBody();
 		$body->rewind();

tests/phpunit/unit/includes/Rest/RestTestTrait.php

@@ -2,6 +2,7 @@
 
 namespace MediaWiki\Tests\Rest;
 
+use EmptyBagOStuff;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Rest\BasicAccess\StaticBasicAuthorizer;
@@ -58,7 +59,7 @@ trait RestTestTrait {
 			$params['routeFiles'] ?? [ MW_INSTALL_PATH . '/tests/phpunit/unit/includes/Rest/testRoutes.json' ],
 			$params['extraRoutes'] ?? [],
 			$params['options'] ?? new ServiceOptions( Router::CONSTRUCTOR_OPTIONS, $config ),
-			$params['cacheBag'] ?? new \EmptyBagOStuff(),
+			$params['cacheBag'] ?? new EmptyBagOStuff(),
 			$params['responseFactory'] ?? new ResponseFactory( [] ),
 			$params['basicAuth'] ?? new StaticBasicAuthorizer(),
 			$params['authority'] ?? $authority,

tests/phpunit/unit/includes/Rest/RouterTest.php

@@ -13,6 +13,7 @@ use MediaWiki\Rest\RequestData;
 use MediaWiki\Rest\RequestInterface;
 use MediaWiki\Rest\ResponseException;
 use MediaWiki\Rest\Router;
+use MediaWikiUnitTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use RuntimeException;
 use Throwable;
@@ -20,7 +21,7 @@ use Throwable;
 /**
  * @covers \MediaWiki\Rest\Router
  */
-class RouterTest extends \MediaWikiUnitTestCase {
+class RouterTest extends MediaWikiUnitTestCase {
 	use RestTestTrait;
 
 	private const CANONICAL_SERVER = 'https://wiki.example.com';

tests/phpunit/unit/includes/Rest/StringStreamTest.php

@@ -4,9 +4,10 @@ namespace MediaWiki\Tests\Rest;
 
 use InvalidArgumentException;
 use MediaWiki\Rest\StringStream;
+use MediaWikiUnitTestCase;
 
 /** @covers \MediaWiki\Rest\StringStream */
-class StringStreamTest extends \MediaWikiUnitTestCase {
+class StringStreamTest extends MediaWikiUnitTestCase {
 	public static function provideSeekGetContents() {
 		return [
 			[ 'abcde', 0, SEEK_SET, 'abcde' ],

tests/phpunit/unit/includes/Rest/Validator/JsonBodyValidatorTest.php

@@ -6,6 +6,7 @@ use MediaWiki\Rest\LocalizedHttpException;
 use MediaWiki\Rest\RequestData;
 use MediaWiki\Rest\Validator\JsonBodyValidator;
 use MediaWiki\Rest\Validator\Validator;
+use MediaWikiUnitTestCase;
 use Wikimedia\Message\ListParam;
 use Wikimedia\Message\ListType;
 use Wikimedia\Message\MessageValue;
@@ -14,7 +15,7 @@ use Wikimedia\ParamValidator\ParamValidator;
 /**
  * @covers \MediaWiki\Rest\Validator\JsonBodyValidator
  */
-class JsonBodyValidatorTest extends \MediaWikiUnitTestCase {
+class JsonBodyValidatorTest extends MediaWikiUnitTestCase {
 
 	public static function provideValidateBody() {
 		yield 'empty object' => [

tests/phpunit/unit/includes/Rest/Validator/ValidatorTest.php

@@ -11,13 +11,14 @@ use MediaWiki\Rest\Validator\NullBodyValidator;
 use MediaWiki\Rest\Validator\Validator;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
+use MediaWikiUnitTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Wikimedia\ParamValidator\ParamValidator;
 
 /**
  * @covers \MediaWiki\Rest\Validator\Validator
  */
-class ValidatorTest extends \MediaWikiUnitTestCase {
+class ValidatorTest extends MediaWikiUnitTestCase {
 	use DummyServicesTrait;
 	use MockAuthorityTrait;