Use namespaced classes

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

Change-Id: I325f5bab163cddf76dbf8d5a6eca35a7ed7b6df7

FancyCaptcha/includes/FancyCaptcha.php

@@ -7,6 +7,7 @@ use FSFileBackend;
 use InvalidArgumentException;
 use MediaWiki\Auth\AuthenticationRequest;
 use MediaWiki\Auth\AuthManager;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Extension\ConfirmEdit\Auth\CaptchaAuthenticationRequest;
 use MediaWiki\Extension\ConfirmEdit\SimpleCaptcha\SimpleCaptcha;
 use MediaWiki\Html\Html;
@@ -16,7 +17,6 @@ use MediaWiki\Utils\MWTimestamp;
 use MediaWiki\WikiMap\WikiMap;
 use NullLockManager;
 use ObjectCache;
-use RequestContext;
 use StatusValue;
 use UnderflowException;
 

FancyCaptcha/includes/HTMLFancyCaptchaField.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\ConfirmEdit\FancyCaptcha;
 
-use HTMLFormField;
 use MediaWiki\Html\Html;
+use MediaWiki\HTMLForm\HTMLFormField;
 
 /**
  * Captcha input field for FancyCaptcha that displays a question and returns the answer.

QuestyCaptcha/includes/QuestyCaptcha.php

@@ -11,11 +11,11 @@
 namespace MediaWiki\Extension\ConfirmEdit\QuestyCaptcha;
 
 use MediaWiki\Auth\AuthenticationRequest;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Extension\ConfirmEdit\Auth\CaptchaAuthenticationRequest;
 use MediaWiki\Extension\ConfirmEdit\SimpleCaptcha\SimpleCaptcha;
 use MediaWiki\Extension\ConfirmEdit\Store\CaptchaStore;
 use MediaWiki\Html\Html;
-use RequestContext;
 use Xml;
 
 class QuestyCaptcha extends SimpleCaptcha {

ReCaptchaNoCaptcha/includes/HTMLReCaptchaNoCaptchaField.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\ConfirmEdit\ReCaptchaNoCaptcha;
 
-use HTMLFormField;
 use MediaWiki\Html\Html;
+use MediaWiki\HTMLForm\HTMLFormField;
 
 /**
  * Creates a ReCaptcha v2 widget. Does not return any data; handling the data submitted by the

ReCaptchaNoCaptcha/includes/ReCaptchaNoCaptcha.php

@@ -11,9 +11,9 @@ use MediaWiki\Extension\ConfirmEdit\SimpleCaptcha\SimpleCaptcha;
 use MediaWiki\Html\Html;
 use MediaWiki\Language\RawMessage;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Message\Message;
 use MediaWiki\Request\WebRequest;
 use MediaWiki\Status\Status;
-use Message;
 
 class ReCaptchaNoCaptcha extends SimpleCaptcha {
 	// used for renocaptcha-edit, renocaptcha-addurl, renocaptcha-badlogin, renocaptcha-createaccount,

SimpleCaptcha/SimpleCaptcha.php

@@ -6,14 +6,14 @@ use ApiBase;
 use ApiEditPage;
 use Content;
 use ExtensionRegistry;
-use HTMLForm;
-use IContextSource;
 use IDBAccessObject;
 use MailAddress;
 use MediaWiki\Auth\AuthenticationRequest;
 use MediaWiki\Cache\CacheKeyHelper;
 use MediaWiki\Config\Config;
 use MediaWiki\Config\ConfigException;
+use MediaWiki\Context\IContextSource;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\EditPage\EditPage;
 use MediaWiki\Extension\ConfirmEdit\Auth\CaptchaAuthenticationRequest;
 use MediaWiki\Extension\ConfirmEdit\CaptchaTriggers;
@@ -21,7 +21,9 @@ use MediaWiki\Extension\ConfirmEdit\Hooks\HookRunner;
 use MediaWiki\Extension\ConfirmEdit\Store\CaptchaStore;
 use MediaWiki\ExternalLinks\ExternalLinksLookup;
 use MediaWiki\ExternalLinks\LinkFilter;
+use MediaWiki\HTMLForm\HTMLForm;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Message\Message;
 use MediaWiki\Output\OutputPage;
 use MediaWiki\Request\ContentSecurityPolicy;
 use MediaWiki\Request\WebRequest;
@@ -30,12 +32,10 @@ use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
-use Message;
 use OOUI\FieldLayout;
 use OOUI\HiddenInputWidget;
 use OOUI\NumberInputWidget;
 use ParserOptions;
-use RequestContext;
 use TextContent;
 use UnexpectedValueException;
 use Wikimedia\IPUtils;

Turnstile/includes/HTMLTurnstileField.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\ConfirmEdit\Turnstile;
 
-use Html;
-use HTMLFormField;
+use MediaWiki\Html\Html;
+use MediaWiki\HTMLForm\HTMLFormField;
 
 /**
  * Creates a Turnstile widget. Does not return any data; handling the data submitted by the

Turnstile/includes/Turnstile.php

@@ -4,16 +4,16 @@ namespace MediaWiki\Extension\ConfirmEdit\Turnstile;
 
 use ApiBase;
 use FormatJson;
-use Html;
 use MediaWiki\Auth\AuthenticationRequest;
 use MediaWiki\Extension\ConfirmEdit\Auth\CaptchaAuthenticationRequest;
 use MediaWiki\Extension\ConfirmEdit\Hooks;
 use MediaWiki\Extension\ConfirmEdit\SimpleCaptcha\SimpleCaptcha;
+use MediaWiki\Html\Html;
 use MediaWiki\Language\RawMessage;
 use MediaWiki\MediaWikiServices;
-use Message;
-use Status;
-use WebRequest;
+use MediaWiki\Message\Message;
+use MediaWiki\Request\WebRequest;
+use MediaWiki\Status\Status;
 
 class Turnstile extends SimpleCaptcha {
 	// used for turnstile-edit, turnstile-addurl, turnstile-badlogin, turnstile-createaccount,

hCaptcha/includes/HCaptcha.php

@@ -5,17 +5,17 @@ namespace MediaWiki\Extension\ConfirmEdit\hCaptcha;
 use ApiBase;
 use FormatJson;
 use MediaWiki\Auth\AuthenticationRequest;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Extension\ConfirmEdit\Auth\CaptchaAuthenticationRequest;
 use MediaWiki\Extension\ConfirmEdit\Hooks;
 use MediaWiki\Extension\ConfirmEdit\SimpleCaptcha\SimpleCaptcha;
 use MediaWiki\Html\Html;
 use MediaWiki\Language\RawMessage;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Message\Message;
 use MediaWiki\Request\ContentSecurityPolicy;
 use MediaWiki\Request\WebRequest;
 use MediaWiki\Status\Status;
-use Message;
-use RequestContext;
 
 class HCaptcha extends SimpleCaptcha {
 	// used for hcaptcha-edit, hcaptcha-addurl, hcaptcha-badlogin, hcaptcha-createaccount,

hCaptcha/includes/HTMLHCaptchaField.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\ConfirmEdit\hCaptcha;
 
-use HTMLFormField;
 use MediaWiki\Html\Html;
+use MediaWiki\HTMLForm\HTMLFormField;
 
 class HTMLHCaptchaField extends HTMLFormField {
 	/** @var string Public key parameter to be passed to hCaptcha. */

includes/Auth/LoginAttemptCounter.php

@@ -6,9 +6,9 @@ use BagOStuff;
 use MediaWiki\Extension\ConfirmEdit\CaptchaTriggers;
 use MediaWiki\Extension\ConfirmEdit\SimpleCaptcha\SimpleCaptcha;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\User\User;
 use MediaWiki\User\UserNameUtils;
 use ObjectCache;
-use User;
 
 /**
  * Helper to count login attempts per IP and per username.

includes/Hooks.php

@@ -7,10 +7,9 @@ namespace MediaWiki\Extension\ConfirmEdit;
 use ApiBase;
 use Content;
 use ExtensionRegistry;
-use HTMLForm;
-use IContextSource;
 use MailAddress;
 use MediaWiki\Api\Hook\APIGetAllowedParamsHook;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\EditPage\EditPage;
 use MediaWiki\Extension\ConfirmEdit\SimpleCaptcha\SimpleCaptcha;
 use MediaWiki\Hook\AlternateEditPreviewHook;
@@ -20,7 +19,9 @@ use MediaWiki\Hook\EditPageBeforeEditButtonsHook;
 use MediaWiki\Hook\EmailUserFormHook;
 use MediaWiki\Hook\EmailUserHook;
 use MediaWiki\Html\Html;
+use MediaWiki\HTMLForm\HTMLForm;
 use MediaWiki\Output\OutputPage;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Permissions\Hook\TitleReadWhitelistHook;
 use MediaWiki\ResourceLoader\Hook\ResourceLoaderRegisterModulesHook;
 use MediaWiki\ResourceLoader\ResourceLoader;
@@ -34,7 +35,6 @@ use MediaWiki\Title\Title;
 use MediaWiki\User\User;
 use MediaWiki\User\UserIdentity;
 use MessageSpecifier;
-use ParserOutput;
 use WANObjectCache;
 use Wikimedia\IPUtils;
 use WikiPage;

tests/phpunit/CaptchaAuthenticationRequestTest.php

@@ -1,10 +1,10 @@
 <?php
 
-use MediaWiki\Auth\AuthenticationRequestTestCase;
 use MediaWiki\Extension\ConfirmEdit\Auth\CaptchaAuthenticationRequest;
 use MediaWiki\Extension\ConfirmEdit\SimpleCaptcha\SimpleCaptcha;
 use MediaWiki\Extension\ConfirmEdit\Store\CaptchaHashStore;
 use MediaWiki\Extension\ConfirmEdit\Store\CaptchaStore;
+use MediaWiki\Tests\Auth\AuthenticationRequestTestCase;
 
 /**
  * @covers \MediaWiki\Extension\ConfirmEdit\Auth\CaptchaAuthenticationRequest

tests/phpunit/CaptchaPreAuthenticationProviderTest.php

@@ -2,6 +2,7 @@
 
 use MediaWiki\Auth\AuthManager;
 use MediaWiki\Auth\UsernameAuthenticationRequest;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Extension\ConfirmEdit\Auth\CaptchaAuthenticationRequest;
 use MediaWiki\Extension\ConfirmEdit\Auth\CaptchaPreAuthenticationProvider;
 use MediaWiki\Extension\ConfirmEdit\Auth\LoginAttemptCounter;

tests/phpunit/HTMLFancyCaptchaFieldTest.php

@@ -1,6 +1,9 @@
 <?php
 
+use MediaWiki\Context\DerivativeContext;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Extension\ConfirmEdit\FancyCaptcha\HTMLFancyCaptchaField;
+use MediaWiki\HTMLForm\HTMLForm;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Request\WebRequest;
 use MediaWiki\Title\Title;

tests/phpunit/HTMLReCaptchaNoCaptchaFieldTest.php

@@ -1,6 +1,9 @@
 <?php
 
+use MediaWiki\Context\DerivativeContext;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Extension\ConfirmEdit\ReCaptchaNoCaptcha\HTMLReCaptchaNoCaptchaField;
+use MediaWiki\HTMLForm\HTMLForm;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Title\Title;
 

tests/phpunit/ReCaptchaNoCaptchaAuthenticationRequestTest.php

@@ -1,7 +1,7 @@
 <?php
 
-use MediaWiki\Auth\AuthenticationRequestTestCase;
 use MediaWiki\Extension\ConfirmEdit\ReCaptchaNoCaptcha\ReCaptchaNoCaptchaAuthenticationRequest;
+use MediaWiki\Tests\Auth\AuthenticationRequestTestCase;
 
 /**
  * @covers \MediaWiki\Extension\ConfirmEdit\ReCaptchaNoCaptcha\ReCaptchaNoCaptchaAuthenticationRequest

tests/phpunit/SimpleCaptcha/CaptchaTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Config\Config;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Extension\ConfirmEdit\CaptchaTriggers;
 use MediaWiki\Extension\ConfirmEdit\SimpleCaptcha\SimpleCaptcha;
 use MediaWiki\Request\WebRequest;