tests: Use namespaced classes

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

Change-Id: Id3c4dd2fe08e520fd3c54ed8b606c794000a8616

tests/Benchmark/GrowthExperimentsBench.php

@@ -2,7 +2,6 @@
 
 namespace GrowthExperiments\Tests\Benchmark;
 
-use CommentStoreComment;
 use GrowthExperiments\GrowthExperimentsServices;
 use GrowthExperiments\NewcomerTasks\AddLink\LinkRecommendation;
 use GrowthExperiments\NewcomerTasks\AddLink\LinkRecommendationMetadata;
@@ -15,13 +14,14 @@ use GrowthExperiments\NewcomerTasks\TaskSuggester\StaticTaskSuggesterFactory;
 use GrowthExperiments\NewcomerTasks\TaskSuggester\TaskSuggester;
 use GrowthExperiments\NewcomerTasks\TaskType\LinkRecommendationTaskType;
 use GrowthExperiments\NewcomerTasks\TaskType\TaskType;
+use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Revision\SlotRecord;
+use MediaWiki\Title\TitleValue;
+use MediaWiki\User\User;
 use MediaWiki\User\UserIdentityValue;
 use StatusValue;
 use TextContent;
-use TitleValue;
-use User;
 
 class GrowthExperimentsBench {
 

tests/Benchmark/SpecialHomepageBench.php

@@ -2,11 +2,11 @@
 
 namespace GrowthExperiments\Tests\Benchmark;
 
-use GlobalVarConfig;
 use GrowthExperiments\GrowthExperimentsServices;
 use GrowthExperiments\Specials\SpecialHomepage;
+use MediaWiki\Config\GlobalVarConfig;
 use MediaWiki\MediaWikiServices;
-use SpecialPage;
+use MediaWiki\SpecialPage\SpecialPage;
 
 $path = dirname( __DIR__, 4 );
 

tests/phpunit/integration/Api/ApiHelpPanelQuestionPosterTest.php

@@ -4,6 +4,9 @@ use GrowthExperiments\Api\ApiHelpPanelPostQuestion;
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\Status\Status;
+use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 
 /**
  * @group API

tests/phpunit/integration/Api/ApiManageMentorListTest.php

@@ -8,7 +8,7 @@ use GrowthExperiments\GrowthExperimentsServices;
 use GrowthExperiments\MentorDashboard\MentorTools\IMentorWeights;
 use GrowthExperiments\MentorDashboard\MentorTools\MentorStatusManager;
 use GrowthExperiments\Mentorship\Mentor;
-use User;
+use MediaWiki\User\User;
 use Wikimedia\Timestamp\ConvertibleTimestamp;
 
 /**

tests/phpunit/integration/Api/ApiQueryImageSuggestionDataTest.php

@@ -13,7 +13,7 @@ use GrowthExperiments\NewcomerTasks\ConfigurationLoader\StaticConfigurationLoade
 use GrowthExperiments\NewcomerTasks\TaskType\ImageRecommendationTaskType;
 use GrowthExperiments\NewcomerTasks\TaskType\TaskType;
 use MediaWiki\MainConfigNames;
-use TitleValue;
+use MediaWiki\Title\TitleValue;
 
 /**
  * @covers \GrowthExperiments\Api\ApiQueryImageSuggestionData

tests/phpunit/integration/Api/ApiQueryMentorStatusTest.php

@@ -6,6 +6,7 @@ use ApiTestCase;
 use ApiUsageException;
 use GrowthExperiments\GrowthExperimentsServices;
 use GrowthExperiments\MentorDashboard\MentorTools\MentorStatusManager;
+use MediaWiki\User\User;
 use MediaWiki\User\UserIdentity;
 use StatusValue;
 
@@ -52,7 +53,7 @@ class ApiQueryMentorStatusTest extends ApiTestCase {
 				'meta' => 'growthmentorstatus'
 			],
 			null,
-			new \User()
+			new User()
 		);
 	}
 

tests/phpunit/integration/Api/ApiSetMentorTest.php

@@ -7,11 +7,11 @@ use ApiUsageException;
 use GrowthExperiments\Mentorship\Store\DatabaseMentorStore;
 use HashBagOStuff;
 use JobQueueGroup;
+use MediaWiki\User\User;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityLookup;
 use PHPUnit\Framework\Constraint\Constraint;
-use User;
 use WANObjectCache;
 use Wikimedia\Rdbms\ILoadBalancer;
 

tests/phpunit/integration/Config/WikiPageConfigWriterIntegrationTest.php

@@ -9,11 +9,11 @@ use GrowthExperiments\GrowthExperimentsServices;
 use InvalidArgumentException;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use MediaWikiIntegrationTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\NullLogger;
 use Throwable;
-use User;
 use Wikimedia\TestingAccessWrapper;
 
 /**

tests/phpunit/integration/DeleteOldSurveysTest.php

@@ -5,9 +5,9 @@ namespace GrowthExperiments\Tests;
 use GrowthExperiments\Maintenance\DeleteOldSurveys;
 use GrowthExperiments\WelcomeSurvey;
 use MediaWiki\MediaWikiServices;
-use MediaWiki\User\UserOptionsLookup;
+use MediaWiki\User\Options\UserOptionsLookup;
+use MediaWiki\User\User;
 use MediaWikiIntegrationTestCase;
-use User;
 use Wikimedia\TestingAccessWrapper;
 
 require_once __DIR__ . '/../../../maintenance/deleteOldSurveys.php';

tests/phpunit/integration/HelpPanelTest.php

@@ -4,9 +4,13 @@ namespace GrowthExperiments\Tests;
 
 use GrowthExperiments\HelpPanel;
 use GrowthExperiments\HelpPanelHooks;
-use HashConfig;
+use MediaWiki\Config\HashConfig;
 use MediaWiki\MediaWikiServices;
-use MediaWiki\User\UserOptionsLookup;
+use MediaWiki\Output\OutputPage;
+use MediaWiki\Request\WebRequest;
+use MediaWiki\Title\TitleValue;
+use MediaWiki\User\Options\UserOptionsLookup;
+use MediaWiki\User\User;
 use MediaWikiIntegrationTestCase;
 
 /**
@@ -36,7 +40,7 @@ class HelpPanelTest extends MediaWikiIntegrationTestCase {
 	 * @dataProvider providerShouldShowHelpPanel
 	 */
 	public function testShouldShowHelpPanel(
-		\TitleValue $title,
+		TitleValue $title,
 		string $action,
 		bool $gesuggestededit,
 		int $userId,
@@ -46,17 +50,17 @@ class HelpPanelTest extends MediaWikiIntegrationTestCase {
 		bool $expected,
 		string $message
 	) {
-		$out = $this->createMock( \OutputPage::class );
+		$out = $this->createMock( OutputPage::class );
 		$out->method( 'getTitle' )
 			->willReturn( $title );
-		$request = $this->createMock( \WebRequest::class );
+		$request = $this->createMock( WebRequest::class );
 		$request->method( 'getVal' )
 			->with( 'action' )
 			->willReturn( $action );
 		$request->method( 'getBool' )
 			->with( 'gesuggestededit' )
 			->willReturn( $gesuggestededit );
-		$user = $this->createPartialMock( \User::class, [ 'isNamed' ] );
+		$user = $this->createPartialMock( User::class, [ 'isNamed' ] );
 		$user->method( 'isNamed' )
 			->willReturn( (bool)$userId );
 		$userOptionsLookupMock = $this->createMock( UserOptionsLookup::class );
@@ -81,7 +85,7 @@ class HelpPanelTest extends MediaWikiIntegrationTestCase {
 		return [
 			[
 				// title
-				new \TitleValue( NS_MAIN, 'Foo' ),
+				new TitleValue( NS_MAIN, 'Foo' ),
 				// action=
 				'edit',
 				// getBool( 'gesuggestededit' )
@@ -99,7 +103,7 @@ class HelpPanelTest extends MediaWikiIntegrationTestCase {
 				'Normal scenario - edit on a main namespace, suggested edit flag, user has pref enabled'
 			],
 			[
-				new \TitleValue( NS_PROJECT, 'Foo' ),
+				new TitleValue( NS_PROJECT, 'Foo' ),
 				'edit',
 				false,
 				1,
@@ -111,7 +115,7 @@ class HelpPanelTest extends MediaWikiIntegrationTestCase {
 				'Namespace of title is in excluded namespaces, help panel should not show'
 			],
 			[
-				new \TitleValue( NS_MAIN, 'Foo' ),
+				new TitleValue( NS_MAIN, 'Foo' ),
 				'blah',
 				true,
 				1,
@@ -122,7 +126,7 @@ class HelpPanelTest extends MediaWikiIntegrationTestCase {
 				'Action of "blah" should result in help panel not showing'
 			],
 			[
-				new \TitleValue( NS_MAIN, 'Foo' ),
+				new TitleValue( NS_MAIN, 'Foo' ),
 				'edit',
 				true,
 				1,
@@ -133,7 +137,7 @@ class HelpPanelTest extends MediaWikiIntegrationTestCase {
 				'User has help panel disabled, but gesuggestededit is set, so the help panel should show'
 			],
 			[
-				new \TitleValue( NS_MAIN, 'Foo' ),
+				new TitleValue( NS_MAIN, 'Foo' ),
 				'edit',
 				true,
 				0,

tests/phpunit/integration/HelpdeskQuestionPosterTest.php

@@ -6,11 +6,11 @@ use DerivativeContext;
 use ExtensionRegistry;
 use GrowthExperiments\HelpPanel\QuestionPoster\HelpdeskQuestionPoster;
 use MediaWiki\Request\FauxRequest;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use MediaWikiIntegrationTestCase;
 use RequestContext;
-use Status;
-use User;
 
 /**
  * @group medium

tests/phpunit/integration/HomepageHooksTest.php

@@ -10,7 +10,7 @@ use GrowthExperiments\NewcomerTasks\AddLink\LinkRecommendationHelper;
 use GrowthExperiments\NewcomerTasks\AddLink\LinkRecommendationStore;
 use GrowthExperiments\NewcomerTasks\ConfigurationLoader\ConfigurationLoader;
 use GrowthExperiments\NewcomerTasks\TaskType\TaskType;
-use HashConfig;
+use MediaWiki\Config\HashConfig;
 use MediaWiki\Language\RawMessage;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MediaWikiServices;

tests/phpunit/integration/MentorDashboard/MenteeOverview/UncachedMenteeOverviewDataProviderTest.php

@@ -5,8 +5,8 @@ namespace GrowthExperiments\Tests;
 use GrowthExperiments\GrowthExperimentsServices;
 use GrowthExperiments\MentorDashboard\MenteeOverview\UncachedMenteeOverviewDataProvider;
 use GrowthExperiments\Mentorship\Store\MentorStore;
+use MediaWiki\User\User;
 use MediaWikiIntegrationTestCase;
-use User;
 use Wikimedia\TestingAccessWrapper;
 
 /**

tests/phpunit/integration/MentorDashboard/PersonalizedPraise/PraiseworthyMenteeSuggesterIntegrationTest.php

@@ -8,12 +8,12 @@ use GrowthExperiments\HomepageHooks;
 use GrowthExperiments\Mentorship\Store\MentorStore;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use MediaWiki\User\UserIdentity;
 use MediaWikiIntegrationTestCase;
 use MockHttpTrait;
 use MWHttpRequest;
 use StatusValue;
-use User;
 
 /**
  * @group Database

tests/phpunit/integration/Mentorship/Hooks/MentorHooksTest.php

@@ -5,8 +5,8 @@ namespace GrowthExperiments\Tests;
 use GrowthExperiments\GrowthExperimentsServices;
 use GrowthExperiments\Mentorship\Store\MentorStore;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use MediaWikiIntegrationTestCase;
-use User;
 use Wikimedia\LightweightObjectStore\ExpirationAwareness;
 use Wikimedia\Timestamp\ConvertibleTimestamp;
 

tests/phpunit/integration/MentorshipTest.php

@@ -3,11 +3,11 @@
 namespace GrowthExperiments\Tests;
 
 use DerivativeContext;
-use GlobalVarConfig;
 use GrowthExperiments\DashboardModule\IDashboardModule;
 use GrowthExperiments\GrowthExperimentsServices;
 use GrowthExperiments\HomepageModules\Mentorship;
 use GrowthExperiments\Mentorship\Store\MentorStore;
+use MediaWiki\Config\GlobalVarConfig;
 use MediaWiki\MediaWikiServices;
 use MediaWikiIntegrationTestCase;
 use RequestContext;

tests/phpunit/integration/NewcomerTasks/AddImage/ImageRecommendationDataValidatorTest.php

@@ -4,8 +4,8 @@ namespace GrowthExperiments\Tests\NewcomerTasks\AddImage;
 
 use GrowthExperiments\NewcomerTasks\AddImage\ImageRecommendationData;
 use GrowthExperiments\NewcomerTasks\AddImage\ImageRecommendationDataValidator;
+use MediaWiki\Status\Status;
 use MediaWikiIntegrationTestCase;
-use Status;
 use StatusValue;
 
 /**

tests/phpunit/integration/NewcomerTasks/AddImage/ImageRecommendationMetadataProviderIntegrationTest.php

@@ -3,9 +3,9 @@
 namespace GrowthExperiments\NewcomerTasks\AddImage;
 
 use DerivativeContext;
+use MediaWiki\Site\Site;
+use MediaWiki\Site\SiteStore;
 use RequestContext;
-use Site;
-use SiteStore;
 
 /**
  * @covers \GrowthExperiments\NewcomerTasks\AddImage\ImageRecommendationMetadataProvider

tests/phpunit/integration/NewcomerTasks/AddImage/ServiceImageRecommendationProviderTest.php

@@ -17,14 +17,14 @@ use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Page\ProperPageIdentity;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\TitleFactory;
+use MediaWiki\Title\TitleValue;
 use MediaWikiIntegrationTestCase;
 use MockTitleTrait;
 use MWHttpRequest;
 use PHPUnit\Framework\MockObject\MockObject;
-use Status;
 use StatusValue;
-use TitleValue;
 
 /**
  * @coversDefaultClass \GrowthExperiments\NewcomerTasks\AddImage\ServiceImageRecommendationProvider

tests/phpunit/integration/NewcomerTasks/AddLink/LinkRecommendationStoreTest.php

@@ -7,8 +7,8 @@ use GrowthExperiments\NewcomerTasks\AddLink\LinkRecommendationLink;
 use GrowthExperiments\NewcomerTasks\AddLink\LinkRecommendationMetadata;
 use GrowthExperiments\NewcomerTasks\AddLink\LinkRecommendationStore;
 use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\Title\TitleValue;
 use MediaWikiIntegrationTestCase;
-use TitleValue;
 
 /**
  * @coversDefaultClass \GrowthExperiments\NewcomerTasks\AddLink\LinkRecommendationStore

tests/phpunit/integration/NewcomerTasks/AddLink/PruningLinkRecommendationProviderTest.php

@@ -10,11 +10,11 @@ use GrowthExperiments\NewcomerTasks\AddLink\PruningLinkRecommendationProvider;
 use GrowthExperiments\NewcomerTasks\AddLink\StaticLinkRecommendationProvider;
 use GrowthExperiments\NewcomerTasks\TaskType\LinkRecommendationTaskType;
 use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\Status\Status;
+use MediaWiki\Title\TitleValue;
 use MediaWikiIntegrationTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
-use Status;
 use StatusValue;
-use TitleValue;
 
 /**
  * @covers \GrowthExperiments\NewcomerTasks\AddLink\PruningLinkRecommendationProvider

tests/phpunit/integration/Rest/Handler/AddLinkSuggestionsHandlerTest.php

@@ -10,11 +10,11 @@ use MediaWiki\Language\RawMessage;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Rest\HttpException;
 use MediaWiki\Rest\ResponseFactory;
+use MediaWiki\Title\TitleValue;
+use MediaWiki\Utils\MWTimestamp;
 use MediaWikiIntegrationTestCase;
-use MWTimestamp;
 use PHPUnit\Framework\MockObject\MockObject;
 use StatusValue;
-use TitleValue;
 use Wikimedia\TestingAccessWrapper;
 
 class AddLinkSuggestionsHandlerTest extends MediaWikiIntegrationTestCase {

tests/phpunit/integration/Specials/SpecialClaimMenteeTest.php

@@ -2,15 +2,15 @@
 
 namespace GrowthExperiments\Tests;
 
-use GlobalVarConfig;
 use GrowthExperiments\GrowthExperimentsServices;
 use GrowthExperiments\Mentorship\Store\MentorStore;
 use GrowthExperiments\Specials\SpecialClaimMentee;
+use MediaWiki\Config\GlobalVarConfig;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Request\FauxRequest;
+use MediaWiki\User\User;
 use PermissionsError;
 use SpecialPageTestBase;
-use User;
 
 /**
  * @group Database

tests/phpunit/integration/Specials/SpecialEnrollAsMentorTest.php

@@ -5,8 +5,8 @@ namespace GrowthExperiments\Tests;
 use GrowthExperiments\GrowthExperimentsServices;
 use GrowthExperiments\Specials\SpecialEnrollAsMentor;
 use MediaWiki\Request\FauxResponse;
+use MediaWiki\SpecialPage\SpecialPage;
 use PermissionsError;
-use SpecialPage;
 use SpecialPageTestBase;
 
 /**

tests/phpunit/integration/Specials/SpecialHomepageTest.php

@@ -2,17 +2,17 @@
 
 namespace GrowthExperiments\Tests;
 
-use GlobalVarConfig;
 use GrowthExperiments\EditInfoService;
 use GrowthExperiments\GrowthExperimentsServices;
 use GrowthExperiments\HomepageHooks;
 use GrowthExperiments\Mentorship\StaticMentorManager;
 use GrowthExperiments\Specials\SpecialHomepage;
 use InvalidArgumentException;
+use MediaWiki\Config\GlobalVarConfig;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Request\FauxRequest;
+use MediaWiki\User\User;
 use SpecialPageTestBase;
-use User;
 
 /**
  * @group Database

tests/phpunit/integration/Specials/SpecialMentorDashboardTest.php

@@ -4,7 +4,7 @@ namespace GrowthExperiments\Tests;
 
 use GrowthExperiments\GrowthExperimentsServices;
 use GrowthExperiments\Specials\SpecialMentorDashboard;
-use SpecialPage;
+use MediaWiki\SpecialPage\SpecialPage;
 use SpecialPageTestBase;
 
 /**

tests/phpunit/integration/Specials/SpecialQuitMentorshipTest.php

@@ -8,8 +8,8 @@ use GrowthExperiments\Mentorship\Store\MentorStore;
 use GrowthExperiments\Specials\SpecialQuitMentorship;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Request\FauxResponse;
+use MediaWiki\User\User;
 use SpecialPageTestBase;
-use User;
 
 /**
  * @coversDefaultClass \GrowthExperiments\Specials\SpecialQuitMentorship

tests/phpunit/integration/Specials/SpecialWelcomeSurveyTest.php

@@ -10,7 +10,7 @@ use GrowthExperiments\WelcomeSurvey;
 use IDBAccessObject;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Request\FauxRequest;
-use MWTimestamp;
+use MediaWiki\Utils\MWTimestamp;
 use Psr\Log\NullLogger;
 use SpecialPageTestBase;
 

tests/phpunit/integration/UserImpact/RefreshUserImpactJobTest.php

@@ -13,8 +13,8 @@ use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityLookup;
 use MediaWiki\User\UserIdentityValue;
 use MediaWiki\User\UserSelectQueryBuilder;
+use MediaWiki\Utils\MWTimestamp;
 use MediaWikiIntegrationTestCase;
-use MWTimestamp;
 
 /**
  * @covers \GrowthExperiments\UserImpact\RefreshUserImpactJob

tests/phpunit/unit/AqsEditInfoServiceTest.php

@@ -4,10 +4,10 @@ namespace GrowthExperiments;
 
 use HashBagOStuff;
 use MediaWiki\Http\HttpRequestFactory;
+use MediaWiki\Status\Status;
 use MediaWikiUnitTestCase;
 use MWHttpRequest;
 use PHPUnit\Framework\MockObject\MockObject;
-use Status;
 use StatusValue;
 use WANObjectCache;
 use Wikimedia\TestingAccessWrapper;

tests/phpunit/unit/ChangeMentorTest.php

@@ -8,13 +8,13 @@ use GrowthExperiments\Mentorship\Mentor;
 use GrowthExperiments\Mentorship\MentorManager;
 use GrowthExperiments\Mentorship\Store\MentorStore;
 use GrowthExperiments\Tests\ChangeMentorForTests;
+use MediaWiki\Status\Status;
+use MediaWiki\User\User;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;
 use MediaWikiUnitTestCase;
 use Psr\Log\NullLogger;
-use Status;
-use User;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IReadableDatabase;
 use Wikimedia\Rdbms\IResultWrapper;

tests/phpunit/unit/Config/GrowthExperimentsMultiConfigTest.php

@@ -2,11 +2,11 @@
 
 namespace GrowthExperiments\Tests;
 
-use ConfigException;
-use GlobalVarConfig;
 use GrowthExperiments\Config\GrowthExperimentsMultiConfig;
 use GrowthExperiments\Config\WikiPageConfig;
-use HashConfig;
+use MediaWiki\Config\ConfigException;
+use MediaWiki\Config\GlobalVarConfig;
+use MediaWiki\Config\HashConfig;
 use MediaWikiUnitTestCase;
 
 /**

tests/phpunit/unit/Config/WikiPageConfigWriterTest.php

@@ -2,7 +2,6 @@
 
 namespace GrowthExperiments\Tests;
 
-use CommentStoreComment;
 use FormatJson;
 use GrowthExperiments\Config\Validation\IConfigValidator;
 use GrowthExperiments\Config\Validation\NoValidationValidator;
@@ -10,6 +9,7 @@ use GrowthExperiments\Config\WikiPageConfigLoader;
 use GrowthExperiments\Config\WikiPageConfigWriter;
 use InvalidArgumentException;
 use JsonContent;
+use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Page\WikiPageFactory;
@@ -17,6 +17,7 @@ use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Storage\PageUpdater;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleFactory;
+use MediaWiki\User\User;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentityValue;
 use MediaWikiUnitTestCase;
@@ -24,7 +25,6 @@ use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\NullLogger;
 use RecentChange;
 use StatusValue;
-use User;
 use Wikimedia\TestingAccessWrapper;
 use WikiPage;
 

tests/phpunit/unit/ExperimentUserManagerTest.php

@@ -5,10 +5,10 @@ namespace GrowthExperiments\Tests\Unit;
 use GrowthExperiments\ExperimentUserManager;
 use GrowthExperiments\VariantHooks;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\User\Options\UserOptionsLookup;
+use MediaWiki\User\Options\UserOptionsManager;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;
-use MediaWiki\User\UserOptionsLookup;
-use MediaWiki\User\UserOptionsManager;
 use MediaWikiUnitTestCase;
 
 /**

tests/phpunit/unit/HomepageHooksTests.php

@@ -13,20 +13,20 @@ use GrowthExperiments\NewcomerTasks\NewcomerTasksInfo;
 use GrowthExperiments\NewcomerTasks\NewcomerTasksUserOptionsLookup;
 use GrowthExperiments\NewcomerTasks\TaskSuggester\TaskSuggesterFactory;
 use GrowthExperiments\NewcomerTasks\TaskType\TaskTypeHandlerRegistry;
-use HashConfig;
 use JobQueueGroup;
+use MediaWiki\Config\HashConfig;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\SpecialPage\SpecialPageFactory;
+use MediaWiki\Title\NamespaceInfo;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleFactory;
+use MediaWiki\User\Options\UserOptionsLookup;
+use MediaWiki\User\Options\UserOptionsManager;
 use MediaWiki\User\UserIdentityUtils;
 use MediaWiki\User\UserIdentityValue;
-use MediaWiki\User\UserOptionsLookup;
-use MediaWiki\User\UserOptionsManager;
 use MediaWikiUnitTestCase;
 use Message;
 use MessageLocalizer;
-use NamespaceInfo;
-use OutputPage;
 use PrefixingStatsdDataFactoryProxy;
 use Wikimedia\Rdbms\ILoadBalancer;
 

tests/phpunit/unit/HomepageModules/SuggestedEditsTest.php

@@ -3,7 +3,6 @@
 namespace GrowthExperiments\Tests\HomepageModules;
 
 use ArrayIterator;
-use GlobalVarConfig;
 use GrowthExperiments\EditInfoService;
 use GrowthExperiments\ExperimentUserManager;
 use GrowthExperiments\HomepageModules\SuggestedEdits;
@@ -19,23 +18,24 @@ use GrowthExperiments\NewcomerTasks\Task\TaskSetFilters;
 use GrowthExperiments\NewcomerTasks\TaskSuggester\SearchStrategy\SearchStrategy;
 use GrowthExperiments\NewcomerTasks\TaskSuggester\StaticTaskSuggester;
 use GrowthExperiments\NewcomerTasks\TaskType\TaskType;
-use HashConfig;
 use IContextSource;
 use Language;
 use MediaWiki\Cache\LinkBatchFactory;
+use MediaWiki\Config\GlobalVarConfig;
+use MediaWiki\Config\HashConfig;
 use MediaWiki\Extension\PageViewInfo\PageViewService;
+use MediaWiki\Output\OutputPage;
+use MediaWiki\Request\WebRequest;
 use MediaWiki\Title\TitleFactory;
+use MediaWiki\Title\TitleValue;
+use MediaWiki\User\Options\UserOptionsLookup;
+use MediaWiki\User\User;
 use MediaWiki\User\UserIdentity;
-use MediaWiki\User\UserOptionsLookup;
 use MediaWikiTestCaseTrait;
 use MediaWikiUnitTestCase;
 use OOUI\BlankTheme;
 use OOUI\Theme;
-use OutputPage;
-use TitleValue;
-use User;
 use WANObjectCache;
-use WebRequest;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IReadableDatabase;
 use Wikimedia\TestingAccessWrapper;

tests/phpunit/unit/LevelingUp/LevelingUpManagerTest.php

@@ -2,7 +2,6 @@
 
 namespace GrowthExperiments\Tests\Unit\LevelingUp;
 
-use Config;
 use GrowthExperiments\LevelingUp\LevelingUpManager;
 use GrowthExperiments\NewcomerTasks\ConfigurationLoader\ConfigurationLoader;
 use GrowthExperiments\NewcomerTasks\ConfigurationLoader\StaticConfigurationLoader;
@@ -13,13 +12,14 @@ use GrowthExperiments\NewcomerTasks\TaskSuggester\TaskSuggesterFactory;
 use GrowthExperiments\NewcomerTasks\TaskType\TaskType;
 use GrowthExperiments\UserImpact\UserImpact;
 use GrowthExperiments\UserImpact\UserImpactLookup;
-use HashConfig;
+use MediaWiki\Config\Config;
+use MediaWiki\Config\HashConfig;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Storage\NameTableStore;
+use MediaWiki\User\Options\UserOptionsLookup;
 use MediaWiki\User\UserEditTracker;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentityValue;
-use MediaWiki\User\UserOptionsLookup;
 use MediaWikiUnitTestCase;
 use Psr\Log\NullLogger;
 use Wikimedia\Rdbms\IConnectionProvider;

tests/phpunit/unit/LocalSearchTaskSuggesterTest.php

@@ -12,11 +12,11 @@ use GrowthExperiments\NewcomerTasks\Topic\Topic;
 use IBufferingStatsdDataFactory;
 use ISearchResultSet;
 use MediaWiki\Cache\LinkBatchFactory;
+use MediaWiki\Status\Status;
 use MediaWikiUnitTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use SearchEngine;
 use SearchEngineFactory;
-use Status;
 use StatusValue;
 use Wikimedia\TestingAccessWrapper;
 

tests/phpunit/unit/MentorDashboard/MentorTools/MentorStatusManagerTest.php

@@ -4,13 +4,13 @@ namespace GrowthExperiments\Tests;
 
 use GrowthExperiments\MentorDashboard\MentorTools\MentorStatusManager;
 use MediaWiki\Block\AbstractBlock;
+use MediaWiki\User\Options\UserOptionsManager;
+use MediaWiki\User\User;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityLookup;
 use MediaWiki\User\UserIdentityValue;
-use MediaWiki\User\UserOptionsManager;
 use MediaWikiUnitTestCase;
-use User;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Timestamp\ConvertibleTimestamp;
 

tests/phpunit/unit/MentorDashboard/PersonalizedPraise/PersonalizedPraiseNotificationsDispatcherTest.php

@@ -3,13 +3,13 @@
 namespace GrowthExperiments\Tests;
 
 use BagOStuff;
-use Config;
 use GrowthExperiments\EventLogging\PersonalizedPraiseLogger;
 use GrowthExperiments\MentorDashboard\PersonalizedPraise\PersonalizedPraiseNotificationsDispatcher;
 use GrowthExperiments\MentorDashboard\PersonalizedPraise\PersonalizedPraiseSettings;
 use HashBagOStuff;
-use HashConfig;
 use LogicException;
+use MediaWiki\Config\Config;
+use MediaWiki\Config\HashConfig;
 use MediaWiki\SpecialPage\SpecialPageFactory;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;

tests/phpunit/unit/MentorDashboard/PersonalizedPraise/PersonalizedPraiseSettingsTest.php

@@ -5,13 +5,13 @@ namespace GrowthExperiments\Tests;
 use FormatJson;
 use GrowthExperiments\MentorDashboard\PersonalizedPraise\PersonalizedPraiseSettings;
 use GrowthExperiments\MentorDashboard\PersonalizedPraise\PraiseworthyConditions;
-use HashConfig;
+use MediaWiki\Config\HashConfig;
 use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Title\TitleFactory;
+use MediaWiki\User\Options\UserOptionsLookup;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;
-use MediaWiki\User\UserOptionsLookup;
 use MediaWikiUnitTestCase;
 use MessageLocalizer;
 

tests/phpunit/unit/MentorDashboard/PersonalizedPraise/PraiseworthyConditionsLookupTest.php

@@ -8,12 +8,12 @@ use GrowthExperiments\MentorDashboard\PersonalizedPraise\PraiseworthyConditions;
 use GrowthExperiments\MentorDashboard\PersonalizedPraise\PraiseworthyConditionsLookup;
 use GrowthExperiments\Mentorship\MentorManager;
 use GrowthExperiments\UserImpact\UserImpact;
+use MediaWiki\User\Options\UserOptionsLookup;
+use MediaWiki\User\User;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentityValue;
-use MediaWiki\User\UserOptionsLookup;
+use MediaWiki\Utils\MWTimestamp;
 use MediaWikiUnitTestCase;
-use MWTimestamp;
-use User;
 
 /**
  * @coversDefaultClass \GrowthExperiments\MentorDashboard\PersonalizedPraise\PraiseworthyConditionsLookup

tests/phpunit/unit/Mentorship/Provider/StructuredMentorProviderTest.php

@@ -5,6 +5,7 @@ namespace GrowthExperiments\Tests;
 use GrowthExperiments\Config\WikiPageConfigLoader;
 use GrowthExperiments\Mentorship\Mentor;
 use GrowthExperiments\Mentorship\Provider\StructuredMentorProvider;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentityLookup;
 use MediaWiki\User\UserIdentityValue;
@@ -14,7 +15,6 @@ use MediaWikiUnitTestCase;
 use Message;
 use MessageLocalizer;
 use PHPUnit\Framework\MockObject\MockObject;
-use Status;
 use Wikimedia\TestingAccessWrapper;
 
 /**

tests/phpunit/unit/Mentorship/Provider/StructuredMentorWriterTest.php

@@ -10,14 +10,14 @@ use GrowthExperiments\Mentorship\Mentor;
 use GrowthExperiments\Mentorship\Provider\MentorProvider;
 use GrowthExperiments\Mentorship\Provider\StructuredMentorWriter;
 use MediaWiki\Block\AbstractBlock;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityLookup;
 use MediaWiki\User\UserIdentityValue;
 use MediaWikiUnitTestCase;
-use Status;
-use User;
 
 /**
  * @coversDefaultClass \GrowthExperiments\Mentorship\Provider\StructuredMentorWriter

tests/phpunit/unit/NewcomerTasks/AddImage/ImageRecommendationMetadataProviderTest.php

@@ -5,11 +5,11 @@ namespace GrowthExperiments\NewcomerTasks\AddImage;
 use DerivativeContext;
 use Language;
 use MediaWiki\Languages\LanguageNameUtils;
+use MediaWiki\Site\Site;
+use MediaWiki\Site\SiteStore;
 use MediaWikiUnitTestCase;
 use Message;
 use PHPUnit\Framework\MockObject\MockObject;
-use Site;
-use SiteStore;
 use StatusValue;
 
 /**

tests/phpunit/unit/NewcomerTasks/AddImage/StaticImageRecommendationProviderTest.php

@@ -7,9 +7,9 @@ use GrowthExperiments\NewcomerTasks\AddImage\ImageRecommendationImage;
 use GrowthExperiments\NewcomerTasks\AddImage\StaticImageRecommendationProvider;
 use GrowthExperiments\NewcomerTasks\TaskType\ImageRecommendationTaskType;
 use GrowthExperiments\NewcomerTasks\TaskType\TaskType;
+use MediaWiki\Title\TitleValue;
 use MediaWikiUnitTestCase;
 use StatusValue;
-use TitleValue;
 
 /**
  * @covers \GrowthExperiments\NewcomerTasks\AddImage\StaticImageRecommendationProvider

tests/phpunit/unit/NewcomerTasks/CacheDecoratorTest.php

@@ -13,11 +13,11 @@ use GrowthExperiments\NewcomerTasks\TaskType\TaskType;
 use HashBagOStuff;
 use JobQueueGroup;
 use MediaWiki\Json\JsonCodec;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentityValue;
 use MediaWikiUnitTestCase;
 use PHPUnit\Framework\MockObject\Stub\ReturnArgument;
 use StatusValue;
-use TitleValue;
 use WANObjectCache;
 
 /**

tests/phpunit/unit/NewcomerTasks/CampaignConfigTest.php

@@ -3,8 +3,8 @@
 namespace GrowthExperiments\Tests;
 
 use GrowthExperiments\NewcomerTasks\CampaignConfig;
+use MediaWiki\User\Options\UserOptionsLookup;
 use MediaWiki\User\UserIdentityValue;
-use MediaWiki\User\UserOptionsLookup;
 use MediaWikiUnitTestCase;
 
 /**

tests/phpunit/unit/NewcomerTasks/ConfigurationLoader/ConfigurationValidatorTest.php

@@ -4,10 +4,10 @@ namespace GrowthExperiments\Tests;
 
 use GrowthExperiments\NewcomerTasks\ConfigurationLoader\ConfigurationValidator;
 use MediaWiki\Collation\CollationFactory;
+use MediaWiki\Title\TitleParser;
 use MediaWikiUnitTestCase;
 use MessageLocalizer;
 use StatusValue;
-use TitleParser;
 
 /**
  * @covers \GrowthExperiments\NewcomerTasks\ConfigurationLoader\ConfigurationValidator

tests/phpunit/unit/NewcomerTasks/ImageRecommendationFilterTest.php

@@ -9,8 +9,8 @@ use GrowthExperiments\NewcomerTasks\Task\TaskSetFilters;
 use GrowthExperiments\NewcomerTasks\TaskType\ImageRecommendationTaskType;
 use GrowthExperiments\NewcomerTasks\TaskType\TemplateBasedTaskType;
 use HashBagOStuff;
+use MediaWiki\Title\TitleValue;
 use MediaWikiUnitTestCase;
-use TitleValue;
 use WANObjectCache;
 
 /**

tests/phpunit/unit/NewcomerTasks/LinkRecommendationFilterTest.php

@@ -10,6 +10,7 @@ use GrowthExperiments\NewcomerTasks\Task\TaskSet;
 use GrowthExperiments\NewcomerTasks\Task\TaskSetFilters;
 use GrowthExperiments\NewcomerTasks\TaskType\LinkRecommendationTaskType;
 use GrowthExperiments\NewcomerTasks\TaskType\TemplateBasedTaskType;
+use MediaWiki\Title\TitleValue;
 use MediaWikiUnitTestCase;
 
 /**
@@ -59,9 +60,9 @@ class LinkRecommendationFilterTest extends MediaWikiUnitTestCase {
 	private function getTaskSet(): TaskSet {
 		$copyEditTaskType = new TemplateBasedTaskType( 'copyedit', 'easy', [], [] );
 		$linkRecommendation = new LinkRecommendationTaskType( 'link-recommendation', 'easy', [] );
-		$task1 = new Task( $copyEditTaskType, new \TitleValue( NS_MAIN, 'Task1' ) );
-		$task2 = new Task( $copyEditTaskType, new \TitleValue( NS_MAIN, 'Task2' ) );
-		$task3 = new Task( $linkRecommendation, new \TitleValue( NS_MAIN, 'Task3' ) );
+		$task1 = new Task( $copyEditTaskType, new TitleValue( NS_MAIN, 'Task1' ) );
+		$task2 = new Task( $copyEditTaskType, new TitleValue( NS_MAIN, 'Task2' ) );
+		$task3 = new Task( $linkRecommendation, new TitleValue( NS_MAIN, 'Task3' ) );
 		return new TaskSet(
 			[ $task1, $task2, $task3 ],
 			3,

tests/phpunit/unit/NewcomerTasks/Task/TaskSetTest.php

@@ -8,8 +8,8 @@ use GrowthExperiments\NewcomerTasks\Task\TaskSetFilters;
 use GrowthExperiments\NewcomerTasks\TaskType\TaskType;
 use InvalidArgumentException;
 use MediaWiki\Json\JsonCodec;
+use MediaWiki\Title\TitleValue;
 use MediaWikiUnitTestCase;
-use TitleValue;
 
 /**
  * @coversDefaultClass \GrowthExperiments\NewcomerTasks\Task\TaskSet

tests/phpunit/unit/NewcomerTasks/Task/TaskTest.php

@@ -6,8 +6,8 @@ use GrowthExperiments\NewcomerTasks\Task\Task;
 use GrowthExperiments\NewcomerTasks\TaskType\TaskType;
 use GrowthExperiments\NewcomerTasks\Topic\Topic;
 use MediaWiki\Json\JsonCodec;
+use MediaWiki\Title\TitleValue;
 use MediaWikiUnitTestCase;
-use TitleValue;
 
 /**
  * @covers \GrowthExperiments\NewcomerTasks\Task\Task

tests/phpunit/unit/NewcomerTasks/TaskType/ImageRecommendationTaskTypeTest.php

@@ -5,8 +5,8 @@ namespace GrowthExperiments\Tests;
 use GrowthExperiments\NewcomerTasks\TaskType\ImageRecommendationTaskType;
 use GrowthExperiments\NewcomerTasks\TaskType\TaskType;
 use MediaWiki\Json\JsonCodec;
+use MediaWiki\Title\TitleValue;
 use MediaWikiUnitTestCase;
-use TitleValue;
 
 /**
  * @covers \GrowthExperiments\NewcomerTasks\TaskType\ImageRecommendationTaskType

tests/phpunit/unit/NewcomerTasks/TaskType/LinkRecommendationTaskTypeTest.php

@@ -5,8 +5,8 @@ namespace GrowthExperiments\Tests;
 use GrowthExperiments\NewcomerTasks\TaskType\LinkRecommendationTaskType;
 use GrowthExperiments\NewcomerTasks\TaskType\TaskType;
 use MediaWiki\Json\JsonCodec;
+use MediaWiki\Title\TitleValue;
 use MediaWikiUnitTestCase;
-use TitleValue;
 
 /**
  * @covers \GrowthExperiments\NewcomerTasks\TaskType\LinkRecommendationTaskType

tests/phpunit/unit/NewcomerTasks/TaskType/TaskTypeHandlerTest.php

@@ -6,10 +6,10 @@ use GrowthExperiments\NewcomerTasks\ConfigurationLoader\ConfigurationValidator;
 use GrowthExperiments\NewcomerTasks\SubmissionHandler;
 use GrowthExperiments\NewcomerTasks\TaskType\NullSubmissionHandler;
 use GrowthExperiments\NewcomerTasks\TaskType\TaskTypeHandler;
+use MediaWiki\Title\TitleParser;
+use MediaWiki\Title\TitleValue;
 use MediaWikiUnitTestCase;
 use StatusValue;
-use TitleParser;
-use TitleValue;
 
 /**
  * @covers \GrowthExperiments\NewcomerTasks\TaskType\TaskTypeHandler

tests/phpunit/unit/NewcomerTasks/TaskType/TaskTypeTest.php

@@ -4,8 +4,8 @@ namespace GrowthExperiments\Tests;
 
 use GrowthExperiments\NewcomerTasks\TaskType\TaskType;
 use MediaWiki\Json\JsonCodec;
+use MediaWiki\Title\TitleValue;
 use MediaWikiUnitTestCase;
-use TitleValue;
 
 /**
  * @covers \GrowthExperiments\NewcomerTasks\TaskType\TaskType

tests/phpunit/unit/NewcomerTasks/TaskType/TemplateBasedTaskTypeTest.php

@@ -5,8 +5,8 @@ namespace GrowthExperiments\Tests;
 use GrowthExperiments\NewcomerTasks\TaskType\TaskType;
 use GrowthExperiments\NewcomerTasks\TaskType\TemplateBasedTaskType;
 use MediaWiki\Json\JsonCodec;
+use MediaWiki\Title\TitleValue;
 use MediaWikiUnitTestCase;
-use TitleValue;
 
 /**
  * @covers \GrowthExperiments\NewcomerTasks\TaskType\TemplateBasedTaskType

tests/phpunit/unit/NewcomerTasks/Topic/MorelikeBasedTopicTest.php

@@ -5,8 +5,8 @@ namespace GrowthExperiments\Tests;
 use GrowthExperiments\NewcomerTasks\Topic\MorelikeBasedTopic;
 use MediaWiki\Json\JsonCodec;
 use MediaWiki\Linker\LinkTarget;
+use MediaWiki\Title\TitleValue;
 use MediaWikiUnitTestCase;
-use TitleValue;
 
 /**
  * @covers \GrowthExperiments\NewcomerTasks\Topic\MorelikeBasedTopic

tests/phpunit/unit/NewcomerTasksUserOptionsLookupTest.php

@@ -12,7 +12,7 @@ use GrowthExperiments\NewcomerTasks\TaskType\ImageRecommendationTaskTypeHandler;
 use GrowthExperiments\NewcomerTasks\TaskType\LinkRecommendationTaskTypeHandler;
 use GrowthExperiments\NewcomerTasks\TaskType\SectionImageRecommendationTaskTypeHandler;
 use GrowthExperiments\NewcomerTasks\TaskType\TaskType;
-use HashConfig;
+use MediaWiki\Config\HashConfig;
 use MediaWiki\User\Options\StaticUserOptionsLookup;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;

tests/phpunit/unit/PageConfigurationLoaderTest.php

@@ -16,18 +16,18 @@ use GrowthExperiments\NewcomerTasks\Topic\MorelikeBasedTopic;
 use GrowthExperiments\NewcomerTasks\Topic\OresBasedTopic;
 use GrowthExperiments\NewcomerTasks\Topic\Topic;
 use IContextSource;
-use MalformedTitleException;
 use MediaWiki\Collation\CollationFactory;
 use MediaWiki\Linker\LinkTarget;
+use MediaWiki\Title\MalformedTitleException;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleFactory;
+use MediaWiki\Title\TitleParser;
+use MediaWiki\Title\TitleValue;
 use MediaWikiUnitTestCase;
 use Message;
 use MessageLocalizer;
 use PHPUnit\Framework\MockObject\MockObject;
 use StatusValue;
-use TitleParser;
-use TitleValue;
 
 /**
  * @coversDefaultClass  \GrowthExperiments\NewcomerTasks\ConfigurationLoader\PageConfigurationLoader

tests/phpunit/unit/ProtectionFilterTest.php

@@ -11,10 +11,10 @@ use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleFactory;
+use MediaWiki\Title\TitleValue;
 use MediaWikiUnitTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use stdClass;
-use TitleValue;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IReadableDatabase;
 

tests/phpunit/unit/QuestionPosterTest.php

@@ -7,10 +7,10 @@ use GrowthExperiments\HelpPanel\QuestionRecord;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Storage\PageUpdater;
+use MediaWiki\User\User;
 use MediaWikiUnitTestCase;
 use RequestContext;
 use StatusValue;
-use User;
 use Wikimedia\ScopedCallback;
 use Wikimedia\TestingAccessWrapper;
 use WikitextContent;

tests/phpunit/unit/RemoteSearchTaskSuggesterTest.php

@@ -21,17 +21,17 @@ use GrowthExperiments\Util;
 use LinkBatch;
 use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\Http\HttpRequestFactory;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleFactory;
+use MediaWiki\Title\TitleParser;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentityValue;
 use MediaWikiUnitTestCase;
 use MWHttpRequest;
 use PHPUnit\Framework\MockObject\Matcher\Invocation as InvocationInterface;
 use PHPUnit\Framework\MockObject\MockObject;
-use Status;
 use StatusValue;
-use TitleParser;
-use TitleValue;
 
 /**
  * @covers \GrowthExperiments\NewcomerTasks\TaskSuggester\RemoteSearchTaskSuggester

tests/phpunit/unit/Rest/Handler/NewcomerTaskCompleteHandlerTest.php

@@ -7,17 +7,17 @@ use GrowthExperiments\NewcomerTasks\NewcomerTasksChangeTagsManager;
 use GrowthExperiments\NewcomerTasks\TaskType\TaskType;
 use GrowthExperiments\NewcomerTasks\TaskType\TaskTypeHandlerRegistry;
 use GrowthExperiments\Rest\Handler\NewcomerTaskCompleteHandler;
-use HashConfig;
+use MediaWiki\Config\HashConfig;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Rest\HttpException;
 use MediaWiki\Rest\RequestData;
 use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Tests\Rest\Handler\HandlerTestTrait;
+use MediaWiki\User\Options\UserOptionsLookup;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityUtils;
 use MediaWiki\User\UserIdentityValue;
-use MediaWiki\User\UserOptionsLookup;
 use Wikimedia\Rdbms\IConnectionProvider;
 
 /**

tests/phpunit/unit/SearchStrategyTest.php

@@ -14,9 +14,9 @@ use GrowthExperiments\NewcomerTasks\TemplateBasedTaskSubmissionHandler;
 use GrowthExperiments\NewcomerTasks\Topic\CampaignTopic;
 use GrowthExperiments\NewcomerTasks\Topic\MorelikeBasedTopic;
 use GrowthExperiments\NewcomerTasks\Topic\OresBasedTopic;
+use MediaWiki\Title\TitleParser;
+use MediaWiki\Title\TitleValue;
 use MediaWikiUnitTestCase;
-use TitleParser;
-use TitleValue;
 
 /**
  * @covers \GrowthExperiments\NewcomerTasks\TaskSuggester\SearchStrategy\SearchStrategy

tests/phpunit/unit/SearchTaskSuggesterFactoryTestBase.php

@@ -6,9 +6,9 @@ use GrowthExperiments\NewcomerTasks\ConfigurationLoader\ConfigurationLoader;
 use GrowthExperiments\NewcomerTasks\TaskType\TaskType;
 use GrowthExperiments\NewcomerTasks\TaskType\TemplateBasedTaskType;
 use GrowthExperiments\NewcomerTasks\Topic\Topic;
+use MediaWiki\Status\Status;
 use MediaWikiUnitTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
-use Status;
 use StatusValue;
 
 abstract class SearchTaskSuggesterFactoryTestBase extends MediaWikiUnitTestCase {

tests/phpunit/unit/SiteNoticeGeneratorTest.php

@@ -7,9 +7,11 @@ use GrowthExperiments\Homepage\SiteNoticeGenerator;
 use GrowthExperiments\HomepageHooks;
 use JobQueueGroup;
 use MediaWiki\Minerva\Skins\SkinMinerva;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Title\Title;
-use MediaWiki\User\UserOptionsLookup;
+use MediaWiki\User\Options\UserOptionsLookup;
+use MediaWiki\User\User;
 use MediaWikiUnitTestCase;
 use OOUI\BlankTheme;
 use OOUI\IconWidget;
@@ -333,7 +335,7 @@ class SiteNoticeGeneratorTest extends MediaWikiUnitTestCase {
 	 * @return MockObject|Skin
 	 */
 	private function getSkinMock( $class = Skin::class ) {
-		$outputMock = $this->createMock( \OutputPage::class );
+		$outputMock = $this->createMock( OutputPage::class );
 		$outputMock->method( 'msg' )
 			->willReturnCallback( function ( $key ) {
 				$messageMock = $this->getDefaultMessageMock();
@@ -344,7 +346,7 @@ class SiteNoticeGeneratorTest extends MediaWikiUnitTestCase {
 				return $messageMock;
 			} );
 
-		$userMock = $this->createNoOpMock( \User::class, [ 'getId', 'getName' ] );
+		$userMock = $this->createNoOpMock( User::class, [ 'getId', 'getName' ] );
 		// This will make user settings update job fail, but we don't care about that.
 		$userMock->method( 'getId' )
 			->willReturn( -1 );

tests/phpunit/unit/StaticTaskSuggesterFactoryTest.php

@@ -8,10 +8,10 @@ use GrowthExperiments\NewcomerTasks\TaskSuggester\ErrorForwardingTaskSuggester;
 use GrowthExperiments\NewcomerTasks\TaskSuggester\StaticTaskSuggester;
 use GrowthExperiments\NewcomerTasks\TaskSuggester\StaticTaskSuggesterFactory;
 use GrowthExperiments\NewcomerTasks\TaskType\TaskType;
+use MediaWiki\Status\Status;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentityValue;
 use MediaWikiUnitTestCase;
-use Status;
-use TitleValue;
 
 /**
  * @covers \GrowthExperiments\NewcomerTasks\TaskSuggester\StaticTaskSuggesterFactory

tests/phpunit/unit/StaticTaskSuggesterTest.php

@@ -8,9 +8,9 @@ use GrowthExperiments\NewcomerTasks\Task\TaskSetFilters;
 use GrowthExperiments\NewcomerTasks\TaskSuggester\StaticTaskSuggester;
 use GrowthExperiments\NewcomerTasks\TaskType\TaskType;
 use GrowthExperiments\NewcomerTasks\Topic\Topic;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentityValue;
 use MediaWikiUnitTestCase;
-use TitleValue;
 
 /**
  * @covers \GrowthExperiments\NewcomerTasks\TaskSuggester\StaticTaskSuggester

tests/phpunit/unit/UserImpact/UserImpactFormatterTest.php

@@ -8,8 +8,8 @@ use GrowthExperiments\UserImpact\ExpensiveUserImpact;
 use GrowthExperiments\UserImpact\UserImpactFormatter;
 use Language;
 use MediaWiki\User\UserIdentityValue;
+use MediaWiki\Utils\MWTimestamp;
 use MediaWikiUnitTestCase;
-use MWTimestamp;
 
 /**
  * @covers \GrowthExperiments\UserImpact\UserImpactFormatter

tests/phpunit/unit/VariantHooksTest.php

@@ -4,13 +4,13 @@ namespace GrowthExperiments\Tests;
 
 use GrowthExperiments\NewcomerTasks\CampaignConfig;
 use GrowthExperiments\VariantHooks;
-use HashConfig;
+use MediaWiki\Config\HashConfig;
 use MediaWiki\ResourceLoader as RL;
 use MediaWiki\SpecialPage\SpecialPageFactory;
-use MediaWiki\User\UserOptionsManager;
+use MediaWiki\User\Options\UserOptionsManager;
+use MediaWiki\User\User;
 use MediaWikiUnitTestCase;
 use Skin;
-use User;
 
 /**
  * @coversDefaultClass \GrowthExperiments\VariantHooks

tests/phpunit/unit/WelcomeSurveyTest.php

@@ -2,17 +2,17 @@
 
 namespace GrowthExperiments\Tests;
 
-use Config;
 use DerivativeContext;
 use GrowthExperiments\WelcomeSurvey;
-use HashConfig;
+use MediaWiki\Config\Config;
+use MediaWiki\Config\HashConfig;
 use MediaWiki\Languages\LanguageNameUtils;
+use MediaWiki\User\Options\UserOptionsManager;
+use MediaWiki\User\User;
 use MediaWiki\User\UserIdentity;
-use MediaWiki\User\UserOptionsManager;
 use MediaWikiUnitTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use RequestContext;
-use User;
 use Wikimedia\Timestamp\ConvertibleTimestamp;
 
 /**

tests/phpunit/unit/WikiPageConfigLoaderTest.php

@@ -14,16 +14,16 @@ use MediaWiki\Http\HttpRequestFactory;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleFactory;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\Utils\UrlUtils;
 use MediaWikiUnitTestCase;
 use MessageSpecifier;
 use MWHttpRequest;
 use PHPUnit\Framework\MockObject\MockObject;
-use Status;
 use StatusValue;
-use TitleValue;
 use WANObjectCache;
 use WikitextContent;
 

tests/selenium/fixtures/GrowthExperiments.LocalSettings.php

@@ -15,6 +15,7 @@ use GrowthExperiments\UserImpact\EditingStreak;
 use GrowthExperiments\UserImpact\StaticUserImpactLookup;
 use GrowthExperiments\UserImpact\UserImpactLookup;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentityValue;
 
 // Raise limits from I2aead24cb7f47