diff options
Diffstat (limited to 'tests/phpunit/includes/api')
5 files changed, 8 insertions, 8 deletions
diff --git a/tests/phpunit/includes/api/ApiBaseTest.php b/tests/phpunit/includes/api/ApiBaseTest.php index 51506e7ac9a5..b93783c9584d 100644 --- a/tests/phpunit/includes/api/ApiBaseTest.php +++ b/tests/phpunit/includes/api/ApiBaseTest.php @@ -10,13 +10,13 @@ use MediaWiki\Api\ApiUsageException; use MediaWiki\Api\Validator\SubmoduleDef; use MediaWiki\Context\DerivativeContext; use MediaWiki\Context\RequestContext; +use MediaWiki\Exception\MWException; use MediaWiki\MediaWikiServices; use MediaWiki\Message\Message; use MediaWiki\ParamValidator\TypeDef\NamespaceDef; use MediaWiki\Permissions\PermissionStatus; use MediaWiki\Request\FauxRequest; use MediaWiki\Title\Title; -use MWException; use StatusValue; use Wikimedia\Message\MessageSpecifier; use Wikimedia\ParamValidator\ParamValidator; diff --git a/tests/phpunit/includes/api/ApiErrorFormatterTest.php b/tests/phpunit/includes/api/ApiErrorFormatterTest.php index 170f0e5fd845..7c43cfa8d1ca 100644 --- a/tests/phpunit/includes/api/ApiErrorFormatterTest.php +++ b/tests/phpunit/includes/api/ApiErrorFormatterTest.php @@ -3,12 +3,12 @@ namespace MediaWiki\Tests\Api; use Exception; -use LocalizedException; use MediaWiki\Api\ApiErrorFormatter; use MediaWiki\Api\ApiErrorFormatter_BackCompat; use MediaWiki\Api\ApiMessage; use MediaWiki\Api\ApiResult; use MediaWiki\Api\IApiMessage; +use MediaWiki\Exception\LocalizedException; use MediaWiki\Language\RawMessage; use MediaWiki\Message\Message; use MediaWiki\Status\Status; diff --git a/tests/phpunit/includes/api/ApiMainTest.php b/tests/phpunit/includes/api/ApiMainTest.php index bf38a8e0d586..8dc8f31f0029 100644 --- a/tests/phpunit/includes/api/ApiMainTest.php +++ b/tests/phpunit/includes/api/ApiMainTest.php @@ -16,6 +16,8 @@ use MediaWiki\Config\Config; use MediaWiki\Config\HashConfig; use MediaWiki\Config\MultiConfig; use MediaWiki\Context\RequestContext; +use MediaWiki\Exception\MWExceptionHandler; +use MediaWiki\Exception\ShellDisabledError; use MediaWiki\Json\FormatJson; use MediaWiki\Language\RawMessage; use MediaWiki\MainConfigNames; @@ -23,11 +25,9 @@ use MediaWiki\Permissions\Authority; use MediaWiki\Request\FauxRequest; use MediaWiki\Request\FauxResponse; use MediaWiki\Request\WebRequest; -use MediaWiki\ShellDisabledError; use MediaWiki\StubObject\StubGlobalUser; use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait; use MediaWiki\User\User; -use MWExceptionHandler; use StatusValue; use UnexpectedValueException; use Wikimedia\Rdbms\DBQueryError; @@ -1086,7 +1086,7 @@ class ApiMainTest extends ApiTestCase { ], [ $nsex, - [ 'existing-error', 'internal_api_error_MediaWiki\ShellDisabledError' ], + [ 'existing-error', 'internal_api_error_MediaWiki\Exception\ShellDisabledError' ], [ 'warnings' => [ [ 'code' => 'existing-warning', 'text' => 'existing warning', 'module' => 'main' ], @@ -1094,7 +1094,7 @@ class ApiMainTest extends ApiTestCase { 'errors' => [ [ 'code' => 'existing-error', 'text' => 'existing error', 'module' => 'main' ], [ - 'code' => 'internal_api_error_MediaWiki\ShellDisabledError', + 'code' => 'internal_api_error_MediaWiki\Exception\ShellDisabledError', 'text' => "[$reqId] Exception caught: " . $nsex->getMessage(), 'data' => [ 'errorclass' => ShellDisabledError::class, diff --git a/tests/phpunit/includes/api/format/ApiFormatJsonTest.php b/tests/phpunit/includes/api/format/ApiFormatJsonTest.php index e2eaa908cc37..71b7b19c4441 100644 --- a/tests/phpunit/includes/api/format/ApiFormatJsonTest.php +++ b/tests/phpunit/includes/api/format/ApiFormatJsonTest.php @@ -5,7 +5,7 @@ namespace MediaWiki\Tests\Api\Format; use InvalidArgumentException; use MediaWiki\Api\ApiFormatJson; use MediaWiki\Api\ApiResult; -use MWException; +use MediaWiki\Exception\MWException; /** * @group API diff --git a/tests/phpunit/includes/api/format/ApiFormatRawTest.php b/tests/phpunit/includes/api/format/ApiFormatRawTest.php index a5e911e63471..aad97097b0d5 100644 --- a/tests/phpunit/includes/api/format/ApiFormatRawTest.php +++ b/tests/phpunit/includes/api/format/ApiFormatRawTest.php @@ -5,7 +5,7 @@ namespace MediaWiki\Tests\Api\Format; use MediaWiki\Api\ApiFormatJson; use MediaWiki\Api\ApiFormatRaw; use MediaWiki\Api\ApiMain; -use MWException; +use MediaWiki\Exception\MWException; /** * @group API |