Use namespaced classes

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

Change-Id: I353b5721ff12ad2ad591ed12f865dac256066091

maintenance/createOAuthConsumer.php

@@ -19,11 +19,11 @@
 
 namespace MediaWiki\Extension\OAuth;
 
-use Maintenance;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Extension\OAuth\Backend\Consumer;
 use MediaWiki\Extension\OAuth\Backend\Utils;
 use MediaWiki\Extension\OAuth\Control\ConsumerSubmitControl;
+use MediaWiki\Maintenance\Maintenance;
 use MediaWiki\User\User;
 use MWRestrictions;
 

maintenance/migrateCentralWiki.php

@@ -25,10 +25,10 @@
 
 require_once "$IP/maintenance/Maintenance.php";
 
-use Maintenance;
 use MediaWiki\Extension\OAuth\Backend\Consumer;
 use MediaWiki\Extension\OAuth\Backend\ConsumerAcceptance;
 use MediaWiki\Extension\OAuth\Backend\MWOAuthDAO;
+use MediaWiki\Maintenance\Maintenance;
 use MediaWiki\MediaWikiServices;
 
 class MigrateCentralWiki extends Maintenance {

maintenance/migrateCentralWikiLogs.php

@@ -16,6 +16,7 @@
 
 require_once "$IP/maintenance/Maintenance.php";
 
+use MediaWiki\Maintenance\Maintenance;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Title\Title;
 use MediaWiki\WikiMap\WikiMap;

maintenance/testOAuthConsumer.php

@@ -2,12 +2,12 @@
 
 namespace MediaWiki\Extension\OAuth;
 
-use Maintenance;
 use MediaWiki\Extension\OAuth\Lib\OAuthConsumer;
 use MediaWiki\Extension\OAuth\Lib\OAuthException;
 use MediaWiki\Extension\OAuth\Lib\OAuthRequest;
 use MediaWiki\Extension\OAuth\Lib\OAuthSignatureMethodHmacSha1;
 use MediaWiki\Extension\OAuth\Lib\OAuthSignatureMethodRsaSha1;
+use MediaWiki\Maintenance\Maintenance;
 
 /**
  * @ingroup Maintenance

src/Backend/Consumer.php

@@ -21,11 +21,10 @@
 
 namespace MediaWiki\Extension\OAuth\Backend;
 
-use FormatJson;
-use IDBAccessObject;
 use LogicException;
 use MediaWiki\Context\IContextSource;
 use MediaWiki\Extension\OAuth\Entity\ClientEntity as OAuth2Client;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\Linker\Linker;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Message\Message;
@@ -34,6 +33,7 @@
 use MediaWiki\WikiMap\WikiMap;
 use MWRestrictions;
 use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\IDBAccessObject;
 
 /**
  * Representation of an OAuth consumer.

src/Backend/ConsumerAcceptance.php

@@ -2,11 +2,11 @@
 
 namespace MediaWiki\Extension\OAuth\Backend;
 
-use FormatJson;
-use IDBAccessObject;
 use MediaWiki\Context\IContextSource;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\MediaWikiServices;
 use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\IDBAccessObject;
 
 /**
  * (c) Aaron Schulz 2013, GPL

src/Backend/MWOAuthDAO.php

@@ -3,7 +3,6 @@
 namespace MediaWiki\Extension\OAuth\Backend;
 
 use Exception;
-use IDBAccessObject;
 use LogicException;
 use MediaWiki\Context\IContextSource;
 use MediaWiki\Logger\LoggerFactory;
@@ -14,6 +13,7 @@
 use Wikimedia\Rdbms\DBError;
 use Wikimedia\Rdbms\DBReadOnlyError;
 use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\IDBAccessObject;
 
 /**
  * (c) Aaron Schulz 2013, GPL

src/Backend/MWOAuthDataStore.php

@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Extension\OAuth\Backend;
 
-use BagOStuff;
 use InvalidArgumentException;
 use MediaWiki\Extension\OAuth\Lib\OAuthConsumer;
 use MediaWiki\Extension\OAuth\Lib\OAuthDataStore;
@@ -11,6 +10,7 @@
 use MediaWiki\Message\Message;
 use MWCryptRand;
 use Psr\Log\LoggerInterface;
+use Wikimedia\ObjectCache\BagOStuff;
 use Wikimedia\Rdbms\IDatabase;
 
 class MWOAuthDataStore extends OAuthDataStore {

src/Backend/Utils.php

@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Extension\OAuth\Backend;
 
-use BagOStuff;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Deferred\AutoCommitUpdate;
 use MediaWiki\Deferred\DeferredUpdates;
@@ -15,6 +14,7 @@
 use MediaWiki\User\User;
 use MediaWiki\WikiMap\WikiMap;
 use MWException;
+use Wikimedia\ObjectCache\BagOStuff;
 use Wikimedia\Rdbms\IDatabase;
 
 /**

src/Control/ConsumerAcceptanceSubmitControl.php

@@ -21,14 +21,14 @@
 
 namespace MediaWiki\Extension\OAuth\Control;
 
-use FormatJson;
 use MediaWiki\Context\IContextSource;
 use MediaWiki\Extension\OAuth\Backend\Consumer;
 use MediaWiki\Extension\OAuth\Backend\ConsumerAcceptance;
 use MediaWiki\Extension\OAuth\Backend\MWOAuthException;
 use MediaWiki\Extension\OAuth\Backend\Utils;
 use MediaWiki\Extension\OAuth\Lib\OAuthException;
 use MediaWiki\Extension\OAuth\Repository\AccessTokenRepository;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 use Wikimedia\Rdbms\IDatabase;

src/Control/ConsumerSubmitControl.php

@@ -2,13 +2,11 @@
 
 namespace MediaWiki\Extension\OAuth\Control;
 
-use ApiMessage;
 use Composer\Semver\VersionParser;
 use Exception;
-use ExtensionRegistry;
-use FormatJson;
 use LogicException;
 use ManualLogEntry;
+use MediaWiki\Api\ApiMessage;
 use MediaWiki\Context\IContextSource;
 use MediaWiki\Extension\Notifications\Model\Event;
 use MediaWiki\Extension\OAuth\Backend\Consumer;
@@ -17,9 +15,11 @@
 use MediaWiki\Extension\OAuth\Backend\Utils;
 use MediaWiki\Extension\OAuth\Entity\ClientEntity;
 use MediaWiki\Extension\OAuth\OAuthServices;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Parser\Sanitizer;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;

src/Control/SubmitControl.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\OAuth\Control;
 
-use ApiMessage;
 use LogicException;
+use MediaWiki\Api\ApiMessage;
 use MediaWiki\Context\ContextSource;
 use MediaWiki\Context\IContextSource;
 use MediaWiki\HTMLForm\HTMLForm;

src/Frontend/OAuthLogFormatter.php

@@ -2,12 +2,12 @@
 
 namespace MediaWiki\Extension\OAuth\Frontend;
 
-use ExtensionRegistry;
 use LogEntry;
 use LogFormatter;
 use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Message\Message;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\UserEditTracker;

src/Frontend/SpecialPages/SpecialMWOAuth.php

@@ -22,7 +22,6 @@
  */
 
 use Firebase\JWT\JWT;
-use FormatJson;
 use MediaWiki\Context\IContextSource;
 use MediaWiki\Extension\OAuth\Backend\Consumer;
 use MediaWiki\Extension\OAuth\Backend\ConsumerAcceptance;
@@ -38,6 +37,7 @@
 use MediaWiki\Extension\OAuth\UserStatementProvider;
 use MediaWiki\Html\Html;
 use MediaWiki\HTMLForm\HTMLForm;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\Linker\Linker;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\Message\Message;

src/Frontend/SpecialPages/SpecialMWOAuthConsumerRegistration.php

@@ -22,7 +22,6 @@
  */
 
 use ErrorPageError;
-use FormatJson;
 use InvalidArgumentException;
 use LogEventsList;
 use LogPage;
@@ -37,6 +36,7 @@
 use MediaWiki\HTMLForm\Field\HTMLHiddenField;
 use MediaWiki\HTMLForm\Field\HTMLRestrictionsField;
 use MediaWiki\HTMLForm\HTMLForm;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\Message\Message;
 use MediaWiki\Permissions\GrantsInfo;
 use MediaWiki\Permissions\GrantsLocalization;
@@ -45,12 +45,12 @@
 use MediaWiki\Status\Status;
 use MediaWiki\User\User;
 use MediaWiki\WikiMap\WikiMap;
+use MediaWiki\Xml\Xml;
 use MWRestrictions;
 use PermissionsError;
 use stdClass;
 use UserBlockedError;
 use Wikimedia\Rdbms\IDatabase;
-use Xml;
 
 /**
  * Page that has registration request form and consumer update form

src/Frontend/SpecialPages/SpecialMWOAuthListConsumers.php

@@ -36,12 +36,12 @@
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\User\User;
 use MediaWiki\WikiMap\WikiMap;
+use MediaWiki\Xml\Xml;
 use MWException;
 use OOUI\HtmlSnippet;
 use PermissionsError;
 use stdClass;
 use Wikimedia\Rdbms\IDatabase;
-use Xml;
 
 /**
  * Special page for listing the queue of consumer requests and managing

src/Frontend/SpecialPages/SpecialMWOAuthManageConsumers.php

@@ -39,12 +39,12 @@
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
+use MediaWiki\Xml\Xml;
 use MWRestrictions;
 use OOUI\HtmlSnippet;
 use PermissionsError;
 use stdClass;
 use Wikimedia\Rdbms\IDatabase;
-use Xml;
 
 /**
  * Special page for listing the queue of consumer requests and managing

src/Frontend/SpecialPages/SpecialMWOAuthManageMyGrants.php

@@ -3,7 +3,6 @@
 namespace MediaWiki\Extension\OAuth\Frontend\SpecialPages;
 
 use ErrorPageError;
-use FormatJson;
 use MediaWiki\Context\IContextSource;
 use MediaWiki\Extension\OAuth\Backend\Consumer;
 use MediaWiki\Extension\OAuth\Backend\ConsumerAcceptance;
@@ -14,6 +13,7 @@
 use MediaWiki\Extension\OAuth\Frontend\Pagers\ManageMyGrantsPager;
 use MediaWiki\Extension\OAuth\Frontend\UIUtils;
 use MediaWiki\HTMLForm\HTMLForm;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Permissions\GrantsInfo;
 use MediaWiki\Permissions\GrantsLocalization;

src/Repository/CacheRepository.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\OAuth\Repository;
 
-use BagOStuff;
 use MediaWiki\Extension\OAuth\Backend\Utils;
+use Wikimedia\ObjectCache\BagOStuff;
 
 abstract class CacheRepository {
 

src/Rest/Handler/RequestClient.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\OAuth\Rest\Handler;
 
-use FormatJson;
 use MediaWiki\Extension\OAuth\Repository\ScopeRepository;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\Rest\LocalizedHttpException;
 use MediaWiki\Rest\Validator\Validator;
 use MWRestrictions;

src/Rest/Handler/Resource.php

@@ -2,12 +2,12 @@
 
 namespace MediaWiki\Extension\OAuth\Rest\Handler;
 
-use FormatJson;
 use GuzzleHttp\Psr7\ServerRequest;
 use MediaWiki\Extension\OAuth\Backend\MWOAuthException;
 use MediaWiki\Extension\OAuth\ResourceServer;
 use MediaWiki\Extension\OAuth\Response;
 use MediaWiki\Extension\OAuth\UserStatementProvider;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\Rest\Handler;
 use MediaWiki\Rest\HttpException;
 use MWException;

src/SessionProvider.php

@@ -2,11 +2,11 @@
 
 namespace MediaWiki\Extension\OAuth;
 
-use ApiBase;
-use ApiMessage;
 use Exception;
 use GuzzleHttp\Psr7\ServerRequest;
 use InvalidArgumentException;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiMessage;
 use MediaWiki\Api\Hook\ApiCheckCanExecuteHook;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Extension\OAuth\Backend\Consumer;

tests/phpunit/Rest/EndpointTestBase.php

@@ -3,9 +3,9 @@
 namespace MediaWiki\Extension\OAuth\Tests\Rest;
 
 use Exception;
-use FormatJson;
 use GuzzleHttp\Psr7\Uri;
 use MediaWiki\Context\RequestContext;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\Rest\Handler;
 use MediaWiki\Rest\HttpException;
 use MediaWiki\Rest\RequestData;

tests/phpunit/Rest/RequestClientEndpointTest.php

@@ -3,8 +3,8 @@
 namespace MediaWiki\Extension\OAuth\Tests\Rest;
 
 use Exception;
-use FormatJson;
 use MediaWiki\Extension\OAuth\Rest\Handler\RequestClient;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Rest\Handler;
 use MediaWiki\Rest\ResponseInterface;

tests/phpunit/Rest/ResetClientSecretEndpointTest.php

@@ -3,10 +3,10 @@
 namespace MediaWiki\Extension\OAuth\Tests\Rest;
 
 use Exception;
-use FormatJson;
 use MediaWiki\Extension\OAuth\Backend\Consumer;
 use MediaWiki\Extension\OAuth\Backend\Utils;
 use MediaWiki\Extension\OAuth\Rest\Handler\ResetClientSecret;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Rest\Handler;
 use MediaWiki\Rest\ResponseInterface;