Use namespaced classes

This requires 1.42 for some new names

Changes to the use statements done automatically via script
Addition of missing use statements and changes to docs done manually

Change-Id: Ic1e2c9a0c891382744e4792bba1effece48e53f3

extension.json

@@ -12,7 +12,7 @@
 	"license-name": "GPL-2.0-or-later",
 	"type": "antispam",
 	"requires": {
-		"MediaWiki": ">= 1.41.0"
+		"MediaWiki": ">= 1.42.0"
 	},
 	"AvailableRights": [
 		"abusefilter-modify",

includes/AbuseFilterChangesList.php

@@ -4,13 +4,13 @@ namespace MediaWiki\Extension\AbuseFilter;
 
 use HtmlArmor;
 use IContextSource;
-use Linker;
 use LogFormatter;
+use MediaWiki\Linker\Linker;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\SpecialPage\SpecialPage;
 use OldChangesList;
 use RecentChange;
-use SpecialPage;
 
 class AbuseFilterChangesList extends OldChangesList {
 

includes/AbuseFilterPreAuthenticationProvider.php

@@ -6,10 +6,10 @@ use IBufferingStatsdDataFactory;
 use MediaWiki\Auth\AbstractPreAuthenticationProvider;
 use MediaWiki\Auth\AuthenticationRequest;
 use MediaWiki\Extension\AbuseFilter\VariableGenerator\VariableGeneratorFactory;
+use MediaWiki\SpecialPage\SpecialPage;
+use MediaWiki\User\User;
 use MediaWiki\User\UserFactory;
-use SpecialPage;
 use StatusValue;
-use User;
 
 /**
  * AuthenticationProvider used to filter account creations. This runs after normal preauth providers

includes/AbuseLogger.php

@@ -2,18 +2,18 @@
 
 namespace MediaWiki\Extension\AbuseFilter;
 
-use DeferredUpdates;
 use ExtensionRegistry;
 use InvalidArgumentException;
 use ManualLogEntry;
 use MediaWiki\CheckUser\Hooks;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesBlobStore;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesManager;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use MediaWiki\User\UserIdentityValue;
-use User;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\LBFactory;
 

includes/AbuseLoggerFactory.php

@@ -7,7 +7,7 @@ use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesBlobStore;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesManager;
 use MediaWiki\Title\Title;
-use User;
+use MediaWiki\User\User;
 use Wikimedia\Rdbms\LBFactory;
 
 class AbuseLoggerFactory {

includes/Api/EvalExpression.php

@@ -9,7 +9,7 @@ use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\Parser\RuleCheckerFactory;
 use MediaWiki\Extension\AbuseFilter\VariableGenerator\VariableGeneratorFactory;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesFormatter;
-use Status;
+use MediaWiki\Status\Status;
 use Wikimedia\ParamValidator\ParamValidator;
 
 class EvalExpression extends ApiBase {

includes/Api/QueryAbuseFilters.php

@@ -23,7 +23,7 @@ use ApiQuery;
 use ApiQueryBase;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
-use MWTimestamp;
+use MediaWiki\Utils\MWTimestamp;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\ParamValidator\TypeDef\IntegerDef;
 

includes/Api/QueryAbuseLog.php

@@ -31,8 +31,8 @@ use MediaWiki\Extension\AbuseFilter\Special\SpecialAbuseLog;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesBlobStore;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesManager;
 use MediaWiki\Title\Title;
-use MWTimestamp;
-use User;
+use MediaWiki\User\User;
+use MediaWiki\Utils\MWTimestamp;
 use Wikimedia\IPUtils;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\ParamValidator\TypeDef\IntegerDef;

includes/BlockAutopromoteStore.php

@@ -4,9 +4,9 @@ namespace MediaWiki\Extension\AbuseFilter;
 
 use BagOStuff;
 use ManualLogEntry;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
 use Psr\Log\LoggerInterface;
-use TitleValue;
 
 /**
  * Class responsible for storing and retrieving blockautopromote status

includes/BlockedDomainFilter.php

@@ -26,10 +26,10 @@ use MediaWiki\CheckUser\Hooks as CUHooks;
 use MediaWiki\Extension\AbuseFilter\Variables\UnsetVariableException;
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesManager;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use Message;
-use Status;
-use User;
 
 /**
  * Filters blocked domains

includes/BlockedDomainStorage.php

@@ -30,12 +30,12 @@ use MediaWiki\Page\WikiPageFactory;
 use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserFactory;
 use MediaWiki\Utils\UrlUtils;
 use Message;
 use RecentChange;
 use StatusValue;
-use TitleValue;
 
 /**
  * Hold and update information about blocked external domains

includes/ChangeTags/ChangeTagValidator.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Extension\AbuseFilter\ChangeTags;
 
 use ChangeTags;
-use Status;
+use MediaWiki\Status\Status;
 
 /**
  * Service for testing whether filters can tag edits and other changes

includes/ChangeTags/ChangeTagger.php

@@ -3,9 +3,9 @@
 namespace MediaWiki\Extension\AbuseFilter\ChangeTags;
 
 use MediaWiki\Extension\AbuseFilter\ActionSpecifier;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentityValue;
 use RecentChange;
-use TitleValue;
 
 /**
  * Class that collects change tags to be later applied

includes/Consequences/Consequence/Block.php

@@ -8,10 +8,10 @@ use MediaWiki\Block\DatabaseBlockStore;
 use MediaWiki\Extension\AbuseFilter\Consequences\Parameters;
 use MediaWiki\Extension\AbuseFilter\FilterUser;
 use MediaWiki\Extension\AbuseFilter\GlobalNameUtils;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
 use MessageLocalizer;
 use Psr\Log\LoggerInterface;
-use TitleValue;
 
 /**
  * Consequence that blocks a single user.

includes/Consequences/Consequence/BlockingConsequence.php

@@ -6,9 +6,9 @@ use LogPage;
 use MediaWiki\Block\BlockUserFactory;
 use MediaWiki\Extension\AbuseFilter\Consequences\Parameters;
 use MediaWiki\Extension\AbuseFilter\FilterUser;
+use MediaWiki\Status\Status;
 use MessageLocalizer;
 use Psr\Log\LoggerInterface;
-use Status;
 use Wikimedia\IPUtils;
 
 /**

includes/Consequences/Consequence/Degroup.php

@@ -9,11 +9,11 @@ use MediaWiki\Extension\AbuseFilter\GlobalNameUtils;
 use MediaWiki\Extension\AbuseFilter\Variables\LazyLoadedVariable;
 use MediaWiki\Extension\AbuseFilter\Variables\UnsetVariableException;
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserGroupManager;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityUtils;
 use MessageLocalizer;
-use TitleValue;
 
 /**
  * Consequence that removes all user groups from a user.

includes/Consequences/ConsequencesExecutor.php

@@ -12,9 +12,9 @@ use MediaWiki\Extension\AbuseFilter\Consequences\Consequence\HookAborterConseque
 use MediaWiki\Extension\AbuseFilter\FilterLookup;
 use MediaWiki\Extension\AbuseFilter\GlobalNameUtils;
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
+use MediaWiki\Status\Status;
 use MediaWiki\User\UserIdentityUtils;
 use Psr\Log\LoggerInterface;
-use Status;
 
 class ConsequencesExecutor {
 	public const CONSTRUCTOR_OPTIONS = [

includes/EditBox/AceEditBoxBuilder.php

@@ -6,12 +6,12 @@ use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\KeywordsManager;
 use MediaWiki\Extension\AbuseFilter\Parser\AbuseFilterTokenizer;
 use MediaWiki\Extension\AbuseFilter\Parser\FilterEvaluator;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\Authority;
 use MessageLocalizer;
 use OOUI\ButtonWidget;
 use OOUI\HorizontalLayout;
 use OOUI\Widget;
-use OutputPage;
 use Xml;
 
 /**

includes/EditBox/EditBoxBuilder.php

@@ -4,6 +4,7 @@ namespace MediaWiki\Extension\AbuseFilter\EditBox;
 
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\KeywordsManager;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\Authority;
 use MessageLocalizer;
 use OOUI\ButtonWidget;
@@ -11,7 +12,6 @@ use OOUI\DropdownInputWidget;
 use OOUI\FieldLayout;
 use OOUI\FieldsetLayout;
 use OOUI\Widget;
-use OutputPage;
 use Xml;
 
 /**

includes/EditBox/EditBoxBuilderFactory.php

@@ -5,9 +5,9 @@ namespace MediaWiki\Extension\AbuseFilter\EditBox;
 use LogicException;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\KeywordsManager;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\Authority;
 use MessageLocalizer;
-use OutputPage;
 
 /**
  * Factory for EditBoxBuilder objects

includes/FilterRunner.php

@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Extension\AbuseFilter;
 
-use DeferredUpdates;
 use InvalidArgumentException;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Extension\AbuseFilter\ChangeTags\ChangeTagger;
 use MediaWiki\Extension\AbuseFilter\Consequences\ConsequencesExecutorFactory;
 use MediaWiki\Extension\AbuseFilter\Filter\ExistingFilter;
@@ -18,8 +18,8 @@ use MediaWiki\Extension\AbuseFilter\Variables\VariablesManager;
 use MediaWiki\Extension\AbuseFilter\Watcher\Watcher;
 use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use Psr\Log\LoggerInterface;
-use User;
 
 /**
  * This class contains the logic for executing abuse filters and their actions. The entry points are

includes/FilterRunnerFactory.php

@@ -15,9 +15,9 @@ use MediaWiki\Extension\AbuseFilter\Variables\VariablesManager;
 use MediaWiki\Extension\AbuseFilter\Watcher\EmergencyWatcher;
 use MediaWiki\Extension\AbuseFilter\Watcher\UpdateHitCountWatcher;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use NullStatsdDataFactory;
 use Psr\Log\LoggerInterface;
-use User;
 
 class FilterRunnerFactory {
 	public const SERVICE_NAME = 'AbuseFilterFilterRunnerFactory';

includes/FilterStore.php

@@ -8,9 +8,9 @@ use MediaWiki\Extension\AbuseFilter\Consequences\ConsequencesRegistry;
 use MediaWiki\Extension\AbuseFilter\Filter\Filter;
 use MediaWiki\Extension\AbuseFilter\Special\SpecialAbuseFilter;
 use MediaWiki\Permissions\Authority;
+use MediaWiki\Status\Status;
 use MediaWiki\User\ActorMigrationBase;
 use MediaWiki\User\UserIdentity;
-use Status;
 use Wikimedia\Rdbms\LBFactory;
 
 /**

includes/FilterUser.php

@@ -3,11 +3,11 @@
 namespace MediaWiki\Extension\AbuseFilter;
 
 use MediaWiki\Permissions\Authority;
+use MediaWiki\User\User;
 use MediaWiki\User\UserGroupManager;
 use MediaWiki\User\UserIdentity;
 use MessageLocalizer;
 use Psr\Log\LoggerInterface;
-use User;
 
 class FilterUser {
 	public const SERVICE_NAME = 'AbuseFilterFilterUser';

includes/FilterValidator.php

@@ -8,8 +8,8 @@ use MediaWiki\Extension\AbuseFilter\Filter\AbstractFilter;
 use MediaWiki\Extension\AbuseFilter\Parser\Exception\UserVisibleException;
 use MediaWiki\Extension\AbuseFilter\Parser\RuleCheckerFactory;
 use MediaWiki\Permissions\Authority;
+use MediaWiki\Status\Status;
 use Message;
-use Status;
 
 /**
  * This class validates filters, e.g. before saving.

includes/Hooks/AbuseFilterAlterVariablesHook.php

@@ -4,7 +4,7 @@ namespace MediaWiki\Extension\AbuseFilter\Hooks;
 
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Title\Title;
-use User;
+use MediaWiki\User\User;
 
 interface AbuseFilterAlterVariablesHook {
 	/**

includes/Hooks/AbuseFilterGenerateUserVarsHook.php

@@ -3,8 +3,8 @@
 namespace MediaWiki\Extension\AbuseFilter\Hooks;
 
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
+use MediaWiki\User\User;
 use RecentChange;
-use User;
 
 interface AbuseFilterGenerateUserVarsHook {
 	/**

includes/Hooks/AbuseFilterGenerateVarsForRecentChangeHook.php

@@ -4,8 +4,8 @@ namespace MediaWiki\Extension\AbuseFilter\Hooks;
 
 use MediaWiki\Extension\AbuseFilter\VariableGenerator\RCVariableGenerator;
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
+use MediaWiki\User\User;
 use RecentChange;
-use User;
 
 interface AbuseFilterGenerateVarsForRecentChangeHook {
 	/**

includes/Hooks/AbuseFilterHookRunner.php

@@ -7,8 +7,8 @@ use MediaWiki\Extension\AbuseFilter\VariableGenerator\RCVariableGenerator;
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use RecentChange;
-use User;
 
 /**
  * Handle running AbuseFilter's hooks

includes/Hooks/AbuseFilterShouldFilterActionHook.php

@@ -4,7 +4,7 @@ namespace MediaWiki\Extension\AbuseFilter\Hooks;
 
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Title\Title;
-use User;
+use MediaWiki\User\User;
 
 interface AbuseFilterShouldFilterActionHook {
 	/**

includes/Hooks/Handlers/EditPermissionHandler.php

@@ -10,10 +10,10 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Permissions\Hook\GetUserPermissionsErrorsHook;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
+use MediaWiki\User\User;
 use MessageSpecifier;
 use StatusValue;
-use TitleValue;
-use User;
 
 /**
  * This hook handler is for very simple checks, rather than the much more advanced ones

includes/Hooks/Handlers/FilteredActionsHandler.php

@@ -4,9 +4,9 @@ namespace MediaWiki\Extension\AbuseFilter\Hooks\Handlers;
 
 use ApiMessage;
 use Content;
-use DeferredUpdates;
 use IBufferingStatsdDataFactory;
 use IContextSource;
+use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Extension\AbuseFilter\BlockedDomainFilter;
 use MediaWiki\Extension\AbuseFilter\EditRevUpdater;
 use MediaWiki\Extension\AbuseFilter\FilterRunnerFactory;
@@ -19,11 +19,11 @@ use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\Page\Hook\ArticleDeleteHook;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Revision\SlotRecord;
+use MediaWiki\Status\Status;
 use MediaWiki\Storage\Hook\ParserOutputStashForEditHook;
 use MediaWiki\Title\Title;
-use Status;
+use MediaWiki\User\User;
 use UploadBase;
-use User;
 use WikiPage;
 
 /**

includes/Hooks/Handlers/SchemaChangesHandler.php

@@ -9,10 +9,10 @@ use MediaWiki\Extension\AbuseFilter\Maintenance\NormalizeThrottleParameters;
 use MediaWiki\Extension\AbuseFilter\Maintenance\UpdateVarDumps;
 use MediaWiki\Installer\Hook\LoadExtensionSchemaUpdatesHook;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\User\User;
 use MediaWiki\User\UserGroupManager;
 use MessageLocalizer;
 use RequestContext;
-use User;
 
 class SchemaChangesHandler implements LoadExtensionSchemaUpdatesHook {
 	/** @var MessageLocalizer */

includes/Hooks/Handlers/ToolLinksHandler.php

@@ -7,9 +7,9 @@ use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\Special\SpecialAbuseLog;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Linker\LinkTarget;
+use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
-use SpecialPage;
-use TitleValue;
+use MediaWiki\Title\TitleValue;
 use Wikimedia\IPUtils;
 
 class ToolLinksHandler implements

includes/Hooks/Handlers/UserMergeHandler.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Hooks\Handlers;
 
-use Config;
+use MediaWiki\Config\Config;
 use MediaWiki\Extension\UserMerge\Hooks\AccountFieldsHook;
 
 class UserMergeHandler implements AccountFieldsHook {

includes/LogFormatter/AbuseFilterModifyLogFormatter.php

@@ -3,8 +3,8 @@
 namespace MediaWiki\Extension\AbuseFilter\LogFormatter;
 
 use LogFormatter;
+use MediaWiki\SpecialPage\SpecialPage;
 use Message;
-use SpecialPage;
 
 class AbuseFilterModifyLogFormatter extends LogFormatter {
 

includes/LogFormatter/AbuseLogHitFormatter.php

@@ -4,8 +4,8 @@ namespace MediaWiki\Extension\AbuseFilter\LogFormatter;
 
 use LogFormatter;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
+use MediaWiki\SpecialPage\SpecialPage;
 use Message;
-use SpecialPage;
 
 /**
  * This class formats abuse log notifications.

includes/Pager/AbuseFilterExaminePager.php

@@ -4,9 +4,9 @@ namespace MediaWiki\Extension\AbuseFilter\Pager;
 
 use MediaWiki\Extension\AbuseFilter\AbuseFilterChangesList;
 use MediaWiki\Linker\LinkRenderer;
+use MediaWiki\Pager\ReverseChronologicalPager;
 use MediaWiki\Title\Title;
 use RecentChange;
-use ReverseChronologicalPager;
 use stdClass;
 use Wikimedia\Rdbms\IDatabase;
 

includes/Pager/AbuseFilterHistoryPager.php

@@ -4,18 +4,18 @@ namespace MediaWiki\Extension\AbuseFilter\Pager;
 
 use HtmlArmor;
 use IContextSource;
-use Linker;
 use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\Extension\AbuseFilter\AbuseFilter;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
 use MediaWiki\Extension\AbuseFilter\FilterLookup;
 use MediaWiki\Extension\AbuseFilter\Special\SpecialAbuseFilter;
 use MediaWiki\Extension\AbuseFilter\SpecsFormatter;
+use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Pager\TablePager;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserRigorOptions;
-use TablePager;
 use UnexpectedValueException;
 use Wikimedia\Rdbms\IResultWrapper;
 use Xml;
@@ -74,7 +74,7 @@ class AbuseFilterHistoryPager extends TablePager {
 	/**
 	 * Note: this method is called by parent::__construct
 	 * @return array
-	 * @see Pager::getFieldNames()
+	 * @see MediaWiki\Pager\Pager::getFieldNames()
 	 */
 	public function getFieldNames() {
 		static $headers = null;

includes/Pager/AbuseFilterPager.php

@@ -2,17 +2,17 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Pager;
 
-use Linker;
 use LogicException;
 use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
 use MediaWiki\Extension\AbuseFilter\SpecsFormatter;
 use MediaWiki\Extension\AbuseFilter\View\AbuseFilterViewList;
+use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;
-use SpecialPage;
+use MediaWiki\Pager\TablePager;
+use MediaWiki\SpecialPage\SpecialPage;
 use stdClass;
-use TablePager;
 use UnexpectedValueException;
 use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\Rdbms\IResultWrapper;
@@ -196,7 +196,7 @@ class AbuseFilterPager extends TablePager {
 	/**
 	 * Note: this method is called by parent::__construct
 	 * @return array
-	 * @see Pager::getFieldNames()
+	 * @see MediaWiki\Pager\Pager::getFieldNames()
 	 */
 	public function getFieldNames() {
 		$headers = [

includes/Pager/AbuseLogPager.php

@@ -4,21 +4,21 @@ namespace MediaWiki\Extension\AbuseFilter\Pager;
 
 use HtmlArmor;
 use IContextSource;
-use Linker;
 use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
 use MediaWiki\Extension\AbuseFilter\CentralDBNotAvailableException;
 use MediaWiki\Extension\AbuseFilter\Special\SpecialAbuseLog;
+use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Pager\ReverseChronologicalPager;
+use MediaWiki\Parser\Sanitizer;
 use MediaWiki\Permissions\PermissionManager;
+use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
 use MediaWiki\WikiMap\WikiMap;
-use ReverseChronologicalPager;
-use Sanitizer;
-use SpecialPage;
 use stdClass;
 use Wikimedia\Rdbms\IResultWrapper;
 use Xml;
@@ -300,7 +300,7 @@ class AbuseLogPager extends ReverseChronologicalPager {
 
 	/**
 	 * Can this user see diffs generated by Special:Undelete for the page?
-	 * @see \SpecialUndelete
+	 * @see MediaWiki\Specials\SpecialUndelete
 	 * @param LinkTarget $page
 	 *
 	 * @return bool
@@ -323,7 +323,7 @@ class AbuseLogPager extends ReverseChronologicalPager {
 
 	/**
 	 * Can this user see diffs generated by Special:Undelete?
-	 * @see \SpecialUndelete
+	 * @see MediaWiki\Specials\SpecialUndelete
 	 *
 	 * @return bool
 	 */

includes/Parser/FilterEvaluator.php

@@ -15,8 +15,8 @@ use MediaWiki\Extension\AbuseFilter\Parser\Exception\UserVisibleException;
 use MediaWiki\Extension\AbuseFilter\Parser\Exception\UserVisibleWarning;
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesManager;
+use MediaWiki\Parser\Sanitizer;
 use Psr\Log\LoggerInterface;
-use Sanitizer;
 use Wikimedia\Equivset\Equivset;
 use Wikimedia\IPUtils;
 

includes/Special/AbuseFilterSpecialPage.php

@@ -4,8 +4,8 @@ namespace MediaWiki\Extension\AbuseFilter\Special;
 
 use HtmlArmor;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
-use SpecialPage;
-use TitleValue;
+use MediaWiki\SpecialPage\SpecialPage;
+use MediaWiki\Title\TitleValue;
 use Xml;
 
 /**

includes/Special/BlockedExternalDomains.php

@@ -20,12 +20,12 @@
 namespace MediaWiki\Extension\AbuseFilter\Special;
 
 use ErrorPageError;
-use Html;
 use HTMLForm;
 use IDBAccessObject;
 use MediaWiki\Extension\AbuseFilter\BlockedDomainStorage;
+use MediaWiki\Html\Html;
+use MediaWiki\SpecialPage\SpecialPage;
 use PermissionsError;
-use SpecialPage;
 use WANObjectCache;
 
 /**

includes/Special/SpecialAbuseFilter.php

@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Special;
 
-use Html;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\CentralDBManager;
 use MediaWiki\Extension\AbuseFilter\Consequences\ConsequencesFactory;
@@ -28,6 +27,7 @@ use MediaWiki\Extension\AbuseFilter\View\AbuseFilterViewList;
 use MediaWiki\Extension\AbuseFilter\View\AbuseFilterViewRevert;
 use MediaWiki\Extension\AbuseFilter\View\AbuseFilterViewTestBatch;
 use MediaWiki\Extension\AbuseFilter\View\AbuseFilterViewTools;
+use MediaWiki\Html\Html;
 use MediaWiki\Title\Title;
 use Wikimedia\ObjectFactory\ObjectFactory;
 

includes/Special/SpecialAbuseLog.php

@@ -4,11 +4,8 @@ namespace MediaWiki\Extension\AbuseFilter\Special;
 
 use DifferenceEngine;
 use ExtensionRegistry;
-use Html;
 use HTMLForm;
 use InvalidArgumentException;
-use Linker;
-use ListToggle;
 use ManualLogEntry;
 use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
@@ -24,17 +21,20 @@ use MediaWiki\Extension\AbuseFilter\Variables\VariablesBlobStore;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesFormatter;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesManager;
 use MediaWiki\Extension\AbuseFilter\View\HideAbuseLog;
+use MediaWiki\Html\Html;
+use MediaWiki\Html\ListToggle;
+use MediaWiki\Linker\Linker;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\SpecialPage\SpecialPage;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityLookup;
 use MediaWiki\WikiMap\WikiMap;
 use OOUI\ButtonInputWidget;
-use SpecialPage;
-use Status;
 use stdClass;
 use Wikimedia\Rdbms\LBFactory;
 use Xml;

includes/VariableGenerator/RCVariableGenerator.php

@@ -8,11 +8,11 @@ use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\Page\WikiPageFactory;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use MimeAnalyzer;
 use MWFileProps;
 use RecentChange;
 use RepoGroup;
-use User;
 
 /**
  * This class contains the logic used to create variable holders used to

includes/VariableGenerator/RunVariableGenerator.php

@@ -12,10 +12,10 @@ use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use MimeAnalyzer;
 use MWFileProps;
 use UploadBase;
-use User;
 use Wikimedia\Assert\PreconditionException;
 use WikiPage;
 

includes/VariableGenerator/VariableGenerator.php

@@ -6,10 +6,10 @@ use MediaWiki\Extension\AbuseFilter\Hooks\AbuseFilterHookRunner;
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Storage\PreparedUpdate;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use MediaWiki\User\UserIdentity;
-use MWTimestamp;
+use MediaWiki\Utils\MWTimestamp;
 use RecentChange;
-use User;
 use WikiPage;
 
 /**

includes/VariableGenerator/VariableGeneratorFactory.php

@@ -7,10 +7,10 @@ use MediaWiki\Extension\AbuseFilter\TextExtractor;
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Page\WikiPageFactory;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use MimeAnalyzer;
 use RecentChange;
 use RepoGroup;
-use User;
 
 class VariableGeneratorFactory {
 	public const SERVICE_NAME = 'AbuseFilterVariableGeneratorFactory';

includes/Variables/LazyVariableComputer.php

@@ -17,6 +17,7 @@ use MediaWiki\Revision\RevisionStore;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Storage\PreparedUpdate;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use MediaWiki\User\UserEditTracker;
 use MediaWiki\User\UserGroupManager;
 use MediaWiki\User\UserIdentity;
@@ -27,7 +28,6 @@ use stdClass;
 use StringUtils;
 use TextContent;
 use UnexpectedValueException;
-use User;
 use WANObjectCache;
 use Wikimedia\Diff\Diff;
 use Wikimedia\Diff\UnifiedDiffFormatter;

includes/Variables/VariablesFormatter.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Variables;
 
-use Html;
 use MediaWiki\Extension\AbuseFilter\KeywordsManager;
+use MediaWiki\Html\Html;
 use MessageLocalizer;
 use Xml;
 

includes/View/AbuseFilterView.php

@@ -9,10 +9,10 @@ use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
 use OOUI;
 use RecentChange;
-use SpecialPage;
 use UnexpectedValueException;
 use Wikimedia\Rdbms\Platform\ISQLPlatform;
 use Xml;

includes/View/AbuseFilterViewDiff.php

@@ -3,9 +3,7 @@
 namespace MediaWiki\Extension\AbuseFilter\View;
 
 use DifferenceEngine;
-use Html;
 use IContextSource;
-use Linker;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\Filter\ClosestFilterVersionNotFoundException;
 use MediaWiki\Extension\AbuseFilter\Filter\FilterNotFoundException;
@@ -14,6 +12,8 @@ use MediaWiki\Extension\AbuseFilter\Filter\HistoryFilter;
 use MediaWiki\Extension\AbuseFilter\FilterLookup;
 use MediaWiki\Extension\AbuseFilter\SpecsFormatter;
 use MediaWiki\Extension\AbuseFilter\TableDiffFormatterFullContext;
+use MediaWiki\Html\Html;
+use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;
 use OOUI;
 use TextContent;

includes/View/AbuseFilterViewEdit.php

@@ -2,10 +2,8 @@
 
 namespace MediaWiki\Extension\AbuseFilter\View;
 
-use Html;
 use HtmlArmor;
 use IContextSource;
-use Linker;
 use LogicException;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\Consequences\ConsequencesRegistry;
@@ -20,12 +18,14 @@ use MediaWiki\Extension\AbuseFilter\FilterProfiler;
 use MediaWiki\Extension\AbuseFilter\FilterStore;
 use MediaWiki\Extension\AbuseFilter\InvalidImportDataException;
 use MediaWiki\Extension\AbuseFilter\SpecsFormatter;
+use MediaWiki\Html\Html;
+use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Permissions\PermissionManager;
+use MediaWiki\SpecialPage\SpecialPage;
+use MediaWiki\Specials\SpecialBlock;
 use OOUI;
-use SpecialBlock;
-use SpecialPage;
 use UnexpectedValueException;
 use Wikimedia\Rdbms\LBFactory;
 use Xml;

includes/View/AbuseFilterViewHistory.php

@@ -4,13 +4,13 @@ namespace MediaWiki\Extension\AbuseFilter\View;
 
 use HTMLForm;
 use IContextSource;
-use Linker;
 use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\Filter\FilterNotFoundException;
 use MediaWiki\Extension\AbuseFilter\FilterLookup;
 use MediaWiki\Extension\AbuseFilter\Pager\AbuseFilterHistoryPager;
 use MediaWiki\Extension\AbuseFilter\SpecsFormatter;
+use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\User\UserNameUtils;
 use OOUI;

includes/View/AbuseFilterViewList.php

@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Extension\AbuseFilter\View;
 
-use Html;
 use HTMLForm;
 use IContextSource;
 use MediaWiki\Cache\LinkBatchFactory;
@@ -12,6 +11,7 @@ use MediaWiki\Extension\AbuseFilter\FilterProfiler;
 use MediaWiki\Extension\AbuseFilter\Pager\AbuseFilterPager;
 use MediaWiki\Extension\AbuseFilter\Pager\GlobalAbuseFilterPager;
 use MediaWiki\Extension\AbuseFilter\SpecsFormatter;
+use MediaWiki\Html\Html;
 use MediaWiki\Linker\LinkRenderer;
 use OOUI;
 use StringUtils;

includes/View/AbuseFilterViewRevert.php

@@ -2,10 +2,8 @@
 
 namespace MediaWiki\Extension\AbuseFilter\View;
 
-use Html;
 use HTMLForm;
 use IContextSource;
-use Linker;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\ActionSpecifier;
 use MediaWiki\Extension\AbuseFilter\Consequences\Consequence\ReversibleConsequence;
@@ -15,12 +13,14 @@ use MediaWiki\Extension\AbuseFilter\FilterLookup;
 use MediaWiki\Extension\AbuseFilter\SpecsFormatter;
 use MediaWiki\Extension\AbuseFilter\Variables\UnsetVariableException;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesBlobStore;
+use MediaWiki\Html\Html;
+use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;
+use MediaWiki\SpecialPage\SpecialPage;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserFactory;
 use Message;
 use PermissionsError;
-use SpecialPage;
-use TitleValue;
 use UnexpectedValueException;
 use UserBlockedError;
 use Wikimedia\Rdbms\LBFactory;

includes/View/AbuseFilterViewTestBatch.php

@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Extension\AbuseFilter\View;
 
-use Html;
 use HTMLForm;
 use IContextSource;
 use LogEventsList;
@@ -13,6 +12,7 @@ use MediaWiki\Extension\AbuseFilter\EditBox\EditBoxBuilderFactory;
 use MediaWiki\Extension\AbuseFilter\EditBox\EditBoxField;
 use MediaWiki\Extension\AbuseFilter\Parser\RuleCheckerFactory;
 use MediaWiki\Extension\AbuseFilter\VariableGenerator\VariableGeneratorFactory;
+use MediaWiki\Html\Html;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Title\Title;

includes/View/HideAbuseLog.php

@@ -2,15 +2,15 @@
 
 namespace MediaWiki\Extension\AbuseFilter\View;
 
-use DeferredUpdates;
-use Html;
 use HTMLForm;
 use IContextSource;
 use LogEventsList;
 use LogPage;
 use ManualLogEntry;
+use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\Pager\AbuseLogPager;
+use MediaWiki\Html\Html;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\MediaWikiServices;
 use Wikimedia\Rdbms\LBFactory;

includes/Watcher/EmergencyWatcher.php

@@ -2,10 +2,10 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Watcher;
 
-use AutoCommitUpdate;
-use DeferredUpdates;
 use InvalidArgumentException;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Deferred\AutoCommitUpdate;
+use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Extension\AbuseFilter\EchoNotifier;
 use MediaWiki\Extension\AbuseFilter\EmergencyCache;
 use MediaWiki\Extension\AbuseFilter\FilterLookup;

includes/Watcher/UpdateHitCountWatcher.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Watcher;
 
-use DeferredUpdates;
+use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Extension\AbuseFilter\CentralDBManager;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\LBFactory;

maintenance/AddMissingLoggingEntries.php

@@ -14,7 +14,7 @@ use LoggedUpdateMaintenance;
 use ManualLogEntry;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
 use MediaWiki\Extension\AbuseFilter\Special\SpecialAbuseFilter;
-use User;
+use MediaWiki\User\User;
 
 /**
  * @codeCoverageIgnore

maintenance/PurgeOldLogIPData.php

@@ -11,7 +11,7 @@ require_once "$IP/maintenance/Maintenance.php";
 // @codeCoverageIgnoreEnd
 
 use Maintenance;
-use MWTimestamp;
+use MediaWiki\Utils\MWTimestamp;
 
 class PurgeOldLogIPData extends Maintenance {
 	public function __construct() {

tests/phpunit/AbuseFilterConsequencesTest.php

@@ -6,7 +6,11 @@ use MediaWiki\Extension\AbuseFilter\FilterRunnerFactory;
 use MediaWiki\Extension\AbuseFilter\Hooks\Handlers\FilteredActionsHandler;
 use MediaWiki\Extension\AbuseFilter\Parser\AFPData;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Status\Status;
 use MediaWiki\Storage\PageEditStash;
+use MediaWiki\Title\Title;
+use MediaWiki\User\User;
+use MediaWiki\WikiMap\WikiMap;
 use Psr\Log\LoggerInterface;
 use Wikimedia\Timestamp\ConvertibleTimestamp;
 

tests/phpunit/AbuseFilterCreateAccountTestTrait.php

@@ -4,6 +4,7 @@ use MediaWiki\Extension\AbuseFilter\AbuseFilterPreAuthenticationProvider;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageReferenceValue;
+use MediaWiki\User\User;
 
 /**
  * This trait can be used to create accounts in integration tests.

tests/phpunit/AbuseFilterUploadTestTrait.php

@@ -2,6 +2,7 @@
 
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Request\FauxRequest;
+use MediaWiki\User\User;
 
 /**
  * This trait can be used to perform uploads in integration tests.

tests/phpunit/LazyVariableComputerDBTest.php

@@ -4,6 +4,7 @@ use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
 use MediaWiki\Extension\AbuseFilter\Variables\LazyLoadedVariable;
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Permissions\UltimateAuthority;
+use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentityValue;
 
 /**

tests/phpunit/RCVariableGeneratorTest.php

@@ -1,9 +1,12 @@
 <?php
 
+use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
 use MediaWiki\Extension\AbuseFilter\Parser\AFPData;
 use MediaWiki\Extension\AbuseFilter\Variables\LazyLoadedVariable;
 use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\Title\Title;
+use MediaWiki\Utils\MWTimestamp;
 
 /**
  * @group Test

tests/phpunit/integration/FilterRunnerTest.php

@@ -17,11 +17,11 @@ use MediaWiki\Extension\AbuseFilter\Parser\RuleCheckerFactory;
 use MediaWiki\Extension\AbuseFilter\VariableGenerator\VariableGeneratorFactory;
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesManager;
+use MediaWiki\Request\WebRequest;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use MediaWikiIntegrationTestCase;
 use Psr\Log\NullLogger;
-use User;
-use WebRequest;
 
 /**
  * @group Test

tests/phpunit/integration/Maintenance/PurgeOldLogIPDataTest.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Tests\Integration;
 
-use HashConfig;
+use MediaWiki\Config\HashConfig;
 use MediaWiki\Extension\AbuseFilter\Maintenance\PurgeOldLogIPData;
 use MediaWiki\Tests\Maintenance\MaintenanceBaseTestCase;
 use Wikimedia\Timestamp\ConvertibleTimestamp;

tests/phpunit/unit/AbuseLoggerFactoryTest.php

@@ -13,8 +13,8 @@ use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesBlobStore;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesManager;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use MediaWikiUnitTestCase;
-use User;
 use Wikimedia\Rdbms\LBFactory;
 
 /**

tests/phpunit/unit/ActionSpecifierTest.php

@@ -5,10 +5,10 @@ namespace MediaWiki\Extension\AbuseFilter\Tests\Unit;
 use InvalidArgumentException;
 use MediaWiki\Extension\AbuseFilter\ActionSpecifier;
 use MediaWiki\Linker\LinkTarget;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;
 use MediaWikiUnitTestCase;
-use TitleValue;
 
 /**
  * @coversDefaultClass \MediaWiki\Extension\AbuseFilter\ActionSpecifier

tests/phpunit/unit/ChangeTags/ChangeTaggerTest.php

@@ -6,10 +6,10 @@ use Generator;
 use MediaWiki\Extension\AbuseFilter\ActionSpecifier;
 use MediaWiki\Extension\AbuseFilter\ChangeTags\ChangeTagger;
 use MediaWiki\Extension\AbuseFilter\ChangeTags\ChangeTagsManager;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentityValue;
 use MediaWikiUnitTestCase;
 use RecentChange;
-use TitleValue;
 
 /**
  * @group Test

tests/phpunit/unit/Consequences/Consequence/BlockTest.php

@@ -10,12 +10,12 @@ use MediaWiki\Block\DatabaseBlockStore;
 use MediaWiki\Extension\AbuseFilter\Consequences\Consequence\Block;
 use MediaWiki\Extension\AbuseFilter\Consequences\Parameters;
 use MediaWiki\Extension\AbuseFilter\FilterUser;
+use MediaWiki\Status\Status;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;
 use MediaWikiUnitTestCase;
 use MessageLocalizer;
 use Psr\Log\NullLogger;
-use Status;
 
 /**
  * @coversDefaultClass \MediaWiki\Extension\AbuseFilter\Consequences\Consequence\Block

tests/phpunit/unit/Consequences/Consequence/RangeBlockTest.php

@@ -10,10 +10,10 @@ use MediaWiki\Extension\AbuseFilter\Consequences\Consequence\RangeBlock;
 use MediaWiki\Extension\AbuseFilter\Consequences\Parameters;
 use MediaWiki\Extension\AbuseFilter\Filter\ExistingFilter;
 use MediaWiki\Extension\AbuseFilter\FilterUser;
+use MediaWiki\Status\Status;
 use MediaWikiUnitTestCase;
 use MessageLocalizer;
 use Psr\Log\NullLogger;
-use Status;
 
 /**
  * @coversDefaultClass \MediaWiki\Extension\AbuseFilter\Consequences\Consequence\RangeBlock

tests/phpunit/unit/Consequences/Consequence/WarnTest.php

@@ -9,10 +9,10 @@ use MediaWiki\Extension\AbuseFilter\Consequences\ConsequenceNotPrecheckedExcepti
 use MediaWiki\Extension\AbuseFilter\Consequences\Parameters;
 use MediaWiki\Extension\AbuseFilter\Filter\ExistingFilter;
 use MediaWiki\Session\Session;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentityValue;
 use MediaWikiUnitTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
-use TitleValue;
 use Wikimedia\TestingAccessWrapper;
 
 /**

tests/phpunit/unit/EditBoxBuilderFactoryTest.php

@@ -8,10 +8,10 @@ use MediaWiki\Extension\AbuseFilter\EditBox\AceEditBoxBuilder;
 use MediaWiki\Extension\AbuseFilter\EditBox\EditBoxBuilderFactory;
 use MediaWiki\Extension\AbuseFilter\EditBox\PlainEditBoxBuilder;
 use MediaWiki\Extension\AbuseFilter\KeywordsManager;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\Authority;
 use MediaWikiUnitTestCase;
 use MessageLocalizer;
-use OutputPage;
 
 /**
  * @coversDefaultClass \MediaWiki\Extension\AbuseFilter\Editbox\EditBoxBuilderFactory

tests/phpunit/unit/EditRevUpdaterTest.php

@@ -9,8 +9,8 @@ use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWikiUnitTestCase;
-use TitleValue;
 use Wikimedia\Rdbms\DBConnRef;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\LBFactory;

tests/phpunit/unit/EditStashCacheTest.php

@@ -8,10 +8,10 @@ use MediaWiki\Extension\AbuseFilter\KeywordsManager;
 use MediaWiki\Extension\AbuseFilter\Variables\LazyVariableComputer;
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesManager;
+use MediaWiki\Title\TitleValue;
 use MediaWikiUnitTestCase;
 use NullStatsdDataFactory;
 use Psr\Log\LoggerInterface;
-use TitleValue;
 
 /**
  * @coversDefaultClass \MediaWiki\Extension\AbuseFilter\EditStashCache

tests/phpunit/unit/FilterRunnerFactoryTest.php

@@ -21,9 +21,9 @@ use MediaWiki\Extension\AbuseFilter\Variables\VariablesManager;
 use MediaWiki\Extension\AbuseFilter\Watcher\EmergencyWatcher;
 use MediaWiki\Extension\AbuseFilter\Watcher\UpdateHitCountWatcher;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use MediaWikiUnitTestCase;
 use Psr\Log\NullLogger;
-use User;
 
 /**
  * @group Test

tests/phpunit/unit/FilterValidatorTest.php

@@ -15,9 +15,9 @@ use MediaWiki\Extension\AbuseFilter\Parser\FilterEvaluator;
 use MediaWiki\Extension\AbuseFilter\Parser\ParserStatus;
 use MediaWiki\Extension\AbuseFilter\Parser\RuleCheckerFactory;
 use MediaWiki\Permissions\Authority;
+use MediaWiki\Status\Status;
 use MediaWikiUnitTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
-use Status;
 
 /**
  * @group Test

tests/phpunit/unit/Hooks/ToolLinksHandlerTest.php

@@ -6,12 +6,12 @@ use IContextSource;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\Hooks\Handlers\ToolLinksHandler;
 use MediaWiki\Linker\LinkRenderer;
+use MediaWiki\Request\WebRequest;
+use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use MediaWikiUnitTestCase;
 use Message;
-use SpecialPage;
-use User;
-use WebRequest;
 
 /**
  * @coversDefaultClass \MediaWiki\Extension\AbuseFilter\Hooks\Handlers\ToolLinksHandler

tests/phpunit/unit/VariableGenerator/VariableGeneratorFactoryTest.php

@@ -8,11 +8,11 @@ use MediaWiki\Extension\AbuseFilter\VariableGenerator\VariableGeneratorFactory;
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Page\WikiPageFactory;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use MediaWikiUnitTestCase;
 use MimeAnalyzer;
 use RecentChange;
 use RepoGroup;
-use User;
 
 /**
  * @group Test

tests/phpunit/unit/VariableGenerator/VariableGeneratorTest.php

@@ -9,9 +9,9 @@ use MediaWiki\Extension\AbuseFilter\VariableGenerator\VariableGenerator;
 use MediaWiki\Extension\AbuseFilter\Variables\LazyLoadedVariable;
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use MediaWiki\User\UserIdentity;
 use MediaWikiUnitTestCase;
-use User;
 use WikiPage;
 
 /**

tests/phpunit/unit/Variables/LazyVariableComputerTest.php

@@ -18,6 +18,7 @@ use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\RevisionStore;
 use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 use MediaWiki\User\UserEditTracker;
 use MediaWiki\User\UserGroupManager;
 use MediaWiki\User\UserIdentityValue;
@@ -25,7 +26,6 @@ use MediaWikiUnitTestCase;
 use ParserFactory;
 use Psr\Log\NullLogger;
 use UnexpectedValueException;
-use User;
 use WANObjectCache;
 use Wikimedia\Rdbms\LBFactory;
 

tests/phpunit/unit/Watcher/EmergencyWatcherTest.php

@@ -8,8 +8,8 @@ use MediaWiki\Extension\AbuseFilter\EmergencyCache;
 use MediaWiki\Extension\AbuseFilter\Filter\ExistingFilter;
 use MediaWiki\Extension\AbuseFilter\FilterLookup;
 use MediaWiki\Extension\AbuseFilter\Watcher\EmergencyWatcher;
+use MediaWiki\Utils\MWTimestamp;
 use MediaWikiUnitTestCase;
-use MWTimestamp;
 use Wikimedia\Rdbms\LBFactory;
 
 /**