Use namespaced classes

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

Change-Id: I48fcc02c61d423c9c5111ae545634fdc5c5cc710

includes/AbuseFilterChangesList.php

@@ -3,15 +3,15 @@
 namespace MediaWiki\Extension\AbuseFilter;
 
 use HtmlArmor;
-use IContextSource;
 use LogFormatter;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Linker\Linker;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\SpecialPage\SpecialPage;
+use MediaWiki\Title\TitleValue;
 use OldChangesList;
 use RecentChange;
-use TitleValue;
 
 class AbuseFilterChangesList extends OldChangesList {
 

includes/Api/CheckMatch.php

@@ -5,7 +5,6 @@ namespace MediaWiki\Extension\AbuseFilter\Api;
 use ApiBase;
 use ApiMain;
 use ApiResult;
-use FormatJson;
 use LogEventsList;
 use LogicException;
 use LogPage;
@@ -15,6 +14,7 @@ use MediaWiki\Extension\AbuseFilter\Special\SpecialAbuseLog;
 use MediaWiki\Extension\AbuseFilter\VariableGenerator\VariableGeneratorFactory;
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesBlobStore;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\Revision\RevisionRecord;
 use RecentChange;
 use Wikimedia\ParamValidator\ParamValidator;

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\Message\Message;
 use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
-use Message;
 
 /**
  * Filters blocked domains

includes/BlockedDomainStorage.php

@@ -22,10 +22,11 @@ namespace MediaWiki\Extension\AbuseFilter;
 use ApiRawMessage;
 use BagOStuff;
 use DBAccessObjectUtils;
-use FormatJson;
 use IDBAccessObject;
-use JsonContent;
 use MediaWiki\CommentStore\CommentStoreComment;
+use MediaWiki\Content\JsonContent;
+use MediaWiki\Json\FormatJson;
+use MediaWiki\Message\Message;
 use MediaWiki\Page\WikiPageFactory;
 use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Revision\RevisionRecord;
@@ -33,7 +34,6 @@ use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserFactory;
 use MediaWiki\Utils\UrlUtils;
-use Message;
 use RecentChange;
 use StatusValue;
 

includes/EditBox/EditBoxField.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Extension\AbuseFilter\EditBox;
 
-use HTMLFormField;
+use MediaWiki\HTMLForm\HTMLFormField;
 
 /**
  * This class is used to easily wrap a filter editor box inside an HTMLForm. For now it's just a transparent

includes/FilterImporter.php

@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Extension\AbuseFilter;
 
-use FormatJson;
 use LogicException;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Extension\AbuseFilter\Consequences\ConsequencesRegistry;
@@ -11,6 +10,7 @@ use MediaWiki\Extension\AbuseFilter\Filter\Flags;
 use MediaWiki\Extension\AbuseFilter\Filter\LastEditInfo;
 use MediaWiki\Extension\AbuseFilter\Filter\MutableFilter;
 use MediaWiki\Extension\AbuseFilter\Filter\Specs;
+use MediaWiki\Json\FormatJson;
 
 /**
  * This class allows encoding filters to (and decoding from) a string format that can be used

includes/FilterValidator.php

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

includes/Hooks/Handlers/EchoHandler.php

@@ -2,11 +2,11 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Hooks\Handlers;
 
-use EchoAttributeManager;
-use EchoUserLocator;
 use MediaWiki\Extension\AbuseFilter\EchoNotifier;
 use MediaWiki\Extension\AbuseFilter\ThrottleFilterPresentationModel;
+use MediaWiki\Extension\Notifications\AttributeManager;
 use MediaWiki\Extension\Notifications\Hooks\BeforeCreateEchoEventHook;
+use MediaWiki\Extension\Notifications\UserLocator;
 
 class EchoHandler implements BeforeCreateEchoEventHook {
 
@@ -25,9 +25,9 @@ class EchoHandler implements BeforeCreateEchoEventHook {
 			'section' => 'alert',
 			'group' => 'negative',
 			'presentation-model' => ThrottleFilterPresentationModel::class,
-			EchoAttributeManager::ATTR_LOCATORS => [
+			AttributeManager::ATTR_LOCATORS => [
 				[
-					[ EchoUserLocator::class, 'locateFromEventExtra' ],
+					[ UserLocator::class, 'locateFromEventExtra' ],
 					[ 'user' ]
 				]
 			],

includes/Hooks/Handlers/EditPermissionHandler.php

@@ -3,8 +3,8 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Hooks\Handlers;
 
-use JsonContent;
 use MediaWiki\Content\Hook\JsonValidateSaveHook;
+use MediaWiki\Content\JsonContent;
 use MediaWiki\Extension\AbuseFilter\BlockedDomainStorage;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;

includes/Hooks/Handlers/FilteredActionsHandler.php

@@ -5,7 +5,7 @@ namespace MediaWiki\Extension\AbuseFilter\Hooks\Handlers;
 use ApiMessage;
 use Content;
 use IBufferingStatsdDataFactory;
-use IContextSource;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Extension\AbuseFilter\BlockedDomainFilter;
 use MediaWiki\Extension\AbuseFilter\EditRevUpdater;

includes/Hooks/Handlers/SchemaChangesHandler.php

@@ -2,16 +2,16 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Hooks\Handlers;
 
-use DatabaseUpdater;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Extension\AbuseFilter\Maintenance\MigrateActorsAF;
 use MediaWiki\Extension\AbuseFilter\Maintenance\UpdateVarDumps;
+use MediaWiki\Installer\DatabaseUpdater;
 use MediaWiki\Installer\Hook\LoadExtensionSchemaUpdatesHook;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\User\User;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserGroupManager;
 use MessageLocalizer;
-use RequestContext;
 
 class SchemaChangesHandler implements LoadExtensionSchemaUpdatesHook {
 	/** @var MessageLocalizer */

includes/Hooks/Handlers/ToolLinksHandler.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Hooks\Handlers;
 
-use IContextSource;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\Special\SpecialAbuseLog;
 use MediaWiki\Linker\LinkRenderer;

includes/LogFormatter/AbuseFilterBlockedDomainHitLogFormatter.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Extension\AbuseFilter\LogFormatter;
 
 use LogFormatter;
-use Message;
+use MediaWiki\Message\Message;
 
 class AbuseFilterBlockedDomainHitLogFormatter extends LogFormatter {
 	/**

includes/LogFormatter/AbuseFilterModifyLogFormatter.php

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

includes/LogFormatter/AbuseLogHitFormatter.php

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

includes/Pager/AbuseFilterHistoryPager.php

@@ -3,8 +3,8 @@
 namespace MediaWiki\Extension\AbuseFilter\Pager;
 
 use HtmlArmor;
-use IContextSource;
 use MediaWiki\Cache\LinkBatchFactory;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Extension\AbuseFilter\AbuseFilter;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
 use MediaWiki\Extension\AbuseFilter\Filter\Flags;

includes/Pager/AbuseLogPager.php

@@ -3,8 +3,8 @@
 namespace MediaWiki\Extension\AbuseFilter\Pager;
 
 use HtmlArmor;
-use IContextSource;
 use MediaWiki\Cache\LinkBatchFactory;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
 use MediaWiki\Extension\AbuseFilter\CentralDBNotAvailableException;

includes/Parser/Exception/UserVisibleException.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Parser\Exception;
 
-use Message;
+use MediaWiki\Message\Message;
 
 /**
  * Exceptions that we might conceivably want to report to ordinary users

includes/Parser/Exception/UserVisibleWarning.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Parser\Exception;
 
-use Message;
+use MediaWiki\Message\Message;
 
 /**
  * A variant of user-visible exception that is not fatal.

includes/Parser/SyntaxChecker.php

@@ -7,7 +7,7 @@ use LogicException;
 use MediaWiki\Extension\AbuseFilter\KeywordsManager;
 use MediaWiki\Extension\AbuseFilter\Parser\Exception\InternalException;
 use MediaWiki\Extension\AbuseFilter\Parser\Exception\UserVisibleException;
-use Message;
+use MediaWiki\Message\Message;
 
 /**
  * SyntaxChecker statically analyzes the code without actually running it.

includes/ServiceWiring.php

@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterActorMigration;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager as PermManager;
 use MediaWiki\Extension\AbuseFilter\AbuseLogger;

includes/Special/BlockedExternalDomains.php

@@ -20,10 +20,10 @@
 namespace MediaWiki\Extension\AbuseFilter\Special;
 
 use ErrorPageError;
-use HTMLForm;
 use IDBAccessObject;
 use MediaWiki\Extension\AbuseFilter\BlockedDomainStorage;
 use MediaWiki\Html\Html;
+use MediaWiki\HTMLForm\HTMLForm;
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\TitleValue;
 use PermissionsError;

includes/Special/SpecialAbuseLog.php

@@ -4,7 +4,6 @@ namespace MediaWiki\Extension\AbuseFilter\Special;
 
 use DifferenceEngine;
 use ExtensionRegistry;
-use HTMLForm;
 use InvalidArgumentException;
 use ManualLogEntry;
 use MediaWiki\Cache\LinkBatchFactory;
@@ -24,6 +23,7 @@ use MediaWiki\Extension\AbuseFilter\Variables\VariablesManager;
 use MediaWiki\Extension\AbuseFilter\View\HideAbuseLog;
 use MediaWiki\Html\Html;
 use MediaWiki\Html\ListToggle;
+use MediaWiki\HTMLForm\HTMLForm;
 use MediaWiki\Linker\Linker;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Permissions\Authority;

includes/SpecsFormatter.php

@@ -5,7 +5,7 @@ namespace MediaWiki\Extension\AbuseFilter;
 use Language;
 use MediaWiki\Extension\AbuseFilter\Filter\AbstractFilter;
 use MediaWiki\Language\RawMessage;
-use Message;
+use MediaWiki\Message\Message;
 use MessageLocalizer;
 
 /**

includes/TextExtractor.php

@@ -3,10 +3,10 @@
 namespace MediaWiki\Extension\AbuseFilter;
 
 use Content;
+use MediaWiki\Content\TextContent;
 use MediaWiki\Extension\AbuseFilter\Hooks\AbuseFilterHookRunner;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Revision\RevisionRecord;
-use TextContent;
 
 /**
  * This service provides an interface to convert RevisionRecord and Content objects to some text

includes/ThrottleFilterPresentationModel.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\AbuseFilter;
 
-use EchoEventPresentationModel;
-use Message;
+use MediaWiki\Extension\Notifications\Formatters\EchoEventPresentationModel;
+use MediaWiki\Message\Message;
 
 class ThrottleFilterPresentationModel extends EchoEventPresentationModel {
 

includes/Variables/LazyVariableComputer.php

@@ -4,6 +4,7 @@ namespace MediaWiki\Extension\AbuseFilter\Variables;
 
 use ContentHandler;
 use Language;
+use MediaWiki\Content\TextContent;
 use MediaWiki\Extension\AbuseFilter\Hooks\AbuseFilterHookRunner;
 use MediaWiki\Extension\AbuseFilter\Parser\AFPData;
 use MediaWiki\Extension\AbuseFilter\TextExtractor;
@@ -28,7 +29,6 @@ use ParserOptions;
 use Psr\Log\LoggerInterface;
 use stdClass;
 use StringUtils;
-use TextContent;
 use UnexpectedValueException;
 use WANObjectCache;
 use Wikimedia\Diff\Diff;

includes/Variables/VariablesBlobStore.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Variables;
 
-use FormatJson;
 use InvalidArgumentException;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\Storage\BlobAccessException;
 use MediaWiki\Storage\BlobStore;
 use MediaWiki\Storage\BlobStoreFactory;

includes/View/AbuseFilterView.php

@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Extension\AbuseFilter\View;
 
-use ContextSource;
 use Flow\Data\Listener\RecentChangesListener;
-use IContextSource;
+use MediaWiki\Context\ContextSource;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Html\Html;
 use MediaWiki\Linker\LinkRenderer;

includes/View/AbuseFilterViewDiff.php

@@ -3,7 +3,8 @@
 namespace MediaWiki\Extension\AbuseFilter\View;
 
 use DifferenceEngine;
-use IContextSource;
+use MediaWiki\Content\TextContent;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\Filter\ClosestFilterVersionNotFoundException;
 use MediaWiki\Extension\AbuseFilter\Filter\FilterNotFoundException;
@@ -16,7 +17,6 @@ use MediaWiki\Html\Html;
 use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;
 use OOUI;
-use TextContent;
 use Wikimedia\Diff\Diff;
 
 class AbuseFilterViewDiff extends AbuseFilterView {

includes/View/AbuseFilterViewEdit.php

@@ -3,9 +3,9 @@
 namespace MediaWiki\Extension\AbuseFilter\View;
 
 use HtmlArmor;
-use IContextSource;
 use IDBAccessObject;
 use LogicException;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\Consequences\ConsequencesRegistry;
 use MediaWiki\Extension\AbuseFilter\EditBox\EditBoxBuilderFactory;
@@ -25,13 +25,13 @@ use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\SpecialPage\SpecialPage;
+use MediaWiki\Xml\Xml;
 use OOUI;
 use UnexpectedValueException;
 use Wikimedia\Rdbms\IExpression;
 use Wikimedia\Rdbms\LBFactory;
 use Wikimedia\Rdbms\LikeValue;
 use Wikimedia\Rdbms\SelectQueryBuilder;
-use Xml;
 
 class AbuseFilterViewEdit extends AbuseFilterView {
 	/**

includes/View/AbuseFilterViewExamine.php

@@ -3,9 +3,8 @@
 namespace MediaWiki\Extension\AbuseFilter\View;
 
 use ChangesList;
-use HTMLForm;
-use IContextSource;
 use LogicException;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterChangesList;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\CentralDBNotAvailableException;
@@ -20,6 +19,7 @@ use MediaWiki\Extension\AbuseFilter\Variables\VariablesBlobStore;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesFormatter;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesManager;
 use MediaWiki\Html\Html;
+use MediaWiki\HTMLForm\HTMLForm;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Title\Title;

includes/View/AbuseFilterViewHistory.php

@@ -2,14 +2,14 @@
 
 namespace MediaWiki\Extension\AbuseFilter\View;
 
-use HTMLForm;
-use IContextSource;
 use MediaWiki\Cache\LinkBatchFactory;
+use MediaWiki\Context\IContextSource;
 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\HTMLForm\HTMLForm;
 use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\User\UserNameUtils;

includes/View/AbuseFilterViewImport.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Extension\AbuseFilter\View;
 
-use HTMLForm;
+use MediaWiki\HTMLForm\HTMLForm;
 
 class AbuseFilterViewImport extends AbuseFilterView {
 	/**

includes/View/AbuseFilterViewList.php

@@ -2,9 +2,8 @@
 
 namespace MediaWiki\Extension\AbuseFilter\View;
 
-use HTMLForm;
-use IContextSource;
 use MediaWiki\Cache\LinkBatchFactory;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\CentralDBManager;
 use MediaWiki\Extension\AbuseFilter\Filter\Flags;
@@ -13,6 +12,7 @@ use MediaWiki\Extension\AbuseFilter\Pager\AbuseFilterPager;
 use MediaWiki\Extension\AbuseFilter\Pager\GlobalAbuseFilterPager;
 use MediaWiki\Extension\AbuseFilter\SpecsFormatter;
 use MediaWiki\Html\Html;
+use MediaWiki\HTMLForm\HTMLForm;
 use MediaWiki\Linker\LinkRenderer;
 use OOUI;
 use StringUtils;

includes/View/AbuseFilterViewRevert.php

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

includes/View/AbuseFilterViewTestBatch.php

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

includes/View/AbuseFilterViewTools.php

@@ -2,12 +2,12 @@
 
 namespace MediaWiki\Extension\AbuseFilter\View;
 
-use HTMLForm;
-use IContextSource;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\EditBox\EditBoxBuilderFactory;
 use MediaWiki\Extension\AbuseFilter\EditBox\EditBoxField;
 use MediaWiki\Html\Html;
+use MediaWiki\HTMLForm\HTMLForm;
 use MediaWiki\Linker\LinkRenderer;
 
 class AbuseFilterViewTools extends AbuseFilterView {

includes/View/HideAbuseLog.php

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

maintenance/UpdateVarDumps.php

@@ -3,12 +3,12 @@
 namespace MediaWiki\Extension\AbuseFilter\Maintenance;
 
 use ExternalStoreAccess;
-use FormatJson;
 use LoggedUpdateMaintenance;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
 use MediaWiki\Extension\AbuseFilter\KeywordsManager;
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesBlobStore;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Title\Title;
 use UnexpectedValueException;

tests/phpunit/AbuseFilterConsequencesTest.php

@@ -1,11 +1,14 @@
 <?php
 
 use MediaWiki\Block\BlockUser;
+use MediaWiki\Content\JsonContent;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
 use MediaWiki\Extension\AbuseFilter\Filter\Flags;
 use MediaWiki\Extension\AbuseFilter\FilterRunnerFactory;
 use MediaWiki\Extension\AbuseFilter\Hooks\Handlers\FilteredActionsHandler;
 use MediaWiki\Extension\AbuseFilter\Parser\AFPData;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Status\Status;
 use MediaWiki\Storage\PageEditStash;

tests/phpunit/AbuseFilterFilterUserTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Extension\AbuseFilter\FilterUser;
+use MediaWiki\Message\Message;
 use Psr\Log\NullLogger;
 
 /**

tests/phpunit/AbuseFilterUploadTestTrait.php

@@ -2,6 +2,7 @@
 
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Request\FauxRequest;
+use MediaWiki\Tests\Api\RandomImageGenerator;
 use MediaWiki\User\User;
 
 /**

tests/phpunit/SchemaChangesHandlerTest.php

@@ -1,6 +1,8 @@
 <?php
 
 use MediaWiki\Extension\AbuseFilter\Hooks\Handlers\SchemaChangesHandler;
+use MediaWiki\Installer\DatabaseUpdater;
+use MediaWiki\User\User;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserGroupManager;
 

tests/phpunit/integration/ActionVariablesIntegrationTest.php

@@ -3,12 +3,10 @@
 namespace MediaWiki\Extension\AbuseFilter\Tests\Integration;
 
 use AbuseFilterCreateAccountTestTrait;
-use ApiTestCase;
 use ApiUsageException;
 use Content;
-use FormatJson;
 use Generator;
-use JsonContent;
+use MediaWiki\Content\JsonContent;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
 use MediaWiki\Extension\AbuseFilter\AbuseLogger;
 use MediaWiki\Extension\AbuseFilter\AbuseLoggerFactory;
@@ -25,9 +23,11 @@ use MediaWiki\Extension\AbuseFilter\Hooks\Handlers\FilteredActionsHandler;
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Extension\AbuseFilter\Watcher\EmergencyWatcher;
 use MediaWiki\Extension\AbuseFilter\Watcher\UpdateHitCountWatcher;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
-use MWTimestamp;
+use MediaWiki\Tests\Api\ApiTestCase;
+use MediaWiki\Utils\MWTimestamp;
 use NullStatsdDataFactory;
 use WikitextContent;
 

tests/phpunit/integration/Api/CheckMatchTest.php

@@ -2,13 +2,13 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Tests\Integration\Api;
 
-use ApiTestCase;
-use FormatJson;
 use MediaWiki\Extension\AbuseFilter\Parser\Exception\InternalException;
 use MediaWiki\Extension\AbuseFilter\Parser\FilterEvaluator;
 use MediaWiki\Extension\AbuseFilter\Parser\ParserStatus;
 use MediaWiki\Extension\AbuseFilter\Parser\RuleCheckerFactory;
 use MediaWiki\Extension\AbuseFilter\Parser\RuleCheckerStatus;
+use MediaWiki\Json\FormatJson;
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 
 /**

tests/phpunit/integration/Api/CheckSyntaxTest.php

@@ -2,12 +2,12 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Tests\Integration\Api;
 
-use ApiTestCase;
 use MediaWiki\Extension\AbuseFilter\Parser\Exception\UserVisibleException;
 use MediaWiki\Extension\AbuseFilter\Parser\Exception\UserVisibleWarning;
 use MediaWiki\Extension\AbuseFilter\Parser\FilterEvaluator;
 use MediaWiki\Extension\AbuseFilter\Parser\ParserStatus;
 use MediaWiki\Extension\AbuseFilter\Parser\RuleCheckerFactory;
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 
 /**

tests/phpunit/integration/Api/EvalExpressionTest.php

@@ -2,11 +2,11 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Tests\Integration\Api;
 
-use ApiTestCase;
 use MediaWiki\Extension\AbuseFilter\Parser\Exception\InternalException;
 use MediaWiki\Extension\AbuseFilter\Parser\FilterEvaluator;
 use MediaWiki\Extension\AbuseFilter\Parser\ParserStatus;
 use MediaWiki\Extension\AbuseFilter\Parser\RuleCheckerFactory;
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 
 /**

tests/phpunit/integration/Api/QueryAbuseLogTest.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Tests\Integration\Api;
 
-use ApiTestCase;
+use MediaWiki\Tests\Api\ApiTestCase;
 
 /**
  * @covers \MediaWiki\Extension\AbuseFilter\Api\QueryAbuseLog

tests/phpunit/integration/Api/UnblockAutopromoteTest.php

@@ -2,10 +2,10 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Tests\Integration\Api;
 
-use ApiTestCase;
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Extension\AbuseFilter\BlockAutopromoteStore;
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 use MediaWiki\User\UserIdentityValue;
 

tests/phpunit/integration/FilteredActionsHandlerTest.php

@@ -3,6 +3,7 @@
 namespace MediaWiki\Extension\AbuseFilter\Tests\Integration;
 
 use Content;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Extension\AbuseFilter\BlockedDomainFilter;
 use MediaWiki\Extension\AbuseFilter\BlockedDomainStorage;
 use MediaWiki\Extension\AbuseFilter\EditRevUpdater;
@@ -14,12 +15,11 @@ use MediaWiki\Extension\AbuseFilter\VariableGenerator\RunVariableGenerator;
 use MediaWiki\Extension\AbuseFilter\VariableGenerator\VariableGeneratorFactory;
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesManager;
+use MediaWiki\Message\Message;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
-use Message;
 use NullStatsdDataFactory;
-use RequestContext;
 
 /**
  * @covers \MediaWiki\Extension\AbuseFilter\Hooks\Handlers\FilteredActionsHandler

tests/phpunit/unit/Hooks/ToolLinksHandlerTest.php

@@ -2,16 +2,16 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Tests\Unit\Hooks;
 
-use IContextSource;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\Hooks\Handlers\ToolLinksHandler;
 use MediaWiki\Linker\LinkRenderer;
+use MediaWiki\Message\Message;
 use MediaWiki\Request\WebRequest;
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
 use MediaWikiUnitTestCase;
-use Message;
 
 /**
  * @covers \MediaWiki\Extension\AbuseFilter\Hooks\Handlers\ToolLinksHandler

tests/phpunit/unit/TextExtractorTest.php

@@ -5,6 +5,7 @@ namespace MediaWiki\Extension\AbuseFilter\Tests\Unit;
 use Content;
 use DummyNonTextContent;
 use Generator;
+use MediaWiki\Content\TextContent;
 use MediaWiki\Extension\AbuseFilter\Hooks\AbuseFilterHookRunner;
 use MediaWiki\Extension\AbuseFilter\TextExtractor;
 use MediaWiki\Page\PageIdentityValue;
@@ -14,7 +15,6 @@ use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\User\UserIdentity;
 use MediaWikiUnitTestCase;
-use TextContent;
 use WikitextContent;
 
 /**

tests/phpunit/unit/Variables/VariablesBlobStoreTest.php

@@ -2,13 +2,13 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Tests\Unit\Variables;
 
-use FormatJson;
 use InvalidArgumentException;
 use MediaWiki\Extension\AbuseFilter\KeywordsManager;
 use MediaWiki\Extension\AbuseFilter\Parser\AFPData;
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesBlobStore;
 use MediaWiki\Extension\AbuseFilter\Variables\VariablesManager;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\Storage\BlobAccessException;
 use MediaWiki\Storage\BlobStore;
 use MediaWiki\Storage\BlobStoreFactory;