diff options
Diffstat (limited to 'tests/phpunit')
14 files changed, 21 insertions, 15 deletions
diff --git a/tests/phpunit/includes/Request/ContentSecurityPolicyTest.php b/tests/phpunit/includes/Request/ContentSecurityPolicyTest.php index ac353e27682f..0a9e6fb641ec 100644 --- a/tests/phpunit/includes/Request/ContentSecurityPolicyTest.php +++ b/tests/phpunit/includes/Request/ContentSecurityPolicyTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\Context\RequestContext; +use MediaWiki\Json\FormatJson; use MediaWiki\MainConfigNames; use MediaWiki\Request\ContentSecurityPolicy; use MediaWiki\Request\FauxResponse; diff --git a/tests/phpunit/includes/Storage/PageUpdaterTest.php b/tests/phpunit/includes/Storage/PageUpdaterTest.php index d0dccd7b9da7..04c71197fc23 100644 --- a/tests/phpunit/includes/Storage/PageUpdaterTest.php +++ b/tests/phpunit/includes/Storage/PageUpdaterTest.php @@ -4,10 +4,10 @@ namespace MediaWiki\Tests\Storage; use ChangeTags; use Content; -use FormatJson; use LogicException; use MediaWiki\CommentStore\CommentStoreComment; use MediaWiki\Deferred\DeferredUpdates; +use MediaWiki\Json\FormatJson; use MediaWiki\Message\Message; use MediaWiki\Page\PageIdentityValue; use MediaWiki\Revision\RenderedRevision; diff --git a/tests/phpunit/includes/api/ApiMainTest.php b/tests/phpunit/includes/api/ApiMainTest.php index 3fd1005cd25a..253560f091eb 100644 --- a/tests/phpunit/includes/api/ApiMainTest.php +++ b/tests/phpunit/includes/api/ApiMainTest.php @@ -9,7 +9,6 @@ use ApiErrorFormatter_BackCompat; use ApiMain; use ApiRawMessage; use ApiUsageException; -use FormatJson; use Generator; use InvalidArgumentException; use LogicException; @@ -17,6 +16,7 @@ use MediaWiki\Config\Config; use MediaWiki\Config\HashConfig; use MediaWiki\Config\MultiConfig; use MediaWiki\Context\RequestContext; +use MediaWiki\Json\FormatJson; use MediaWiki\Language\RawMessage; use MediaWiki\MainConfigNames; use MediaWiki\Permissions\Authority; diff --git a/tests/phpunit/includes/content/JsonContentHandlerIntegrationTest.php b/tests/phpunit/includes/content/JsonContentHandlerIntegrationTest.php index b12cbf2e23e8..3ef2f3f45268 100644 --- a/tests/phpunit/includes/content/JsonContentHandlerIntegrationTest.php +++ b/tests/phpunit/includes/content/JsonContentHandlerIntegrationTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\Content\ValidationParams; +use MediaWiki\Json\FormatJson; use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageIdentityValue; use MediaWiki\Title\Title; diff --git a/tests/phpunit/integration/includes/Rest/Handler/UpdateHandlerTest.php b/tests/phpunit/integration/includes/Rest/Handler/UpdateHandlerTest.php index aa4286fd5b1a..79aa9e0632f3 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/UpdateHandlerTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/UpdateHandlerTest.php @@ -3,8 +3,8 @@ namespace MediaWiki\Tests\Rest\Handler; use ApiUsageException; -use FormatJson; use MediaWiki\Config\HashConfig; +use MediaWiki\Json\FormatJson; use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\Linker\LinkRenderer; use MediaWiki\MainConfigNames; diff --git a/tests/phpunit/integration/includes/Storage/RevertedTagUpdateIntegrationTest.php b/tests/phpunit/integration/includes/Storage/RevertedTagUpdateIntegrationTest.php index c86c2adeb4fe..f418310199bb 100644 --- a/tests/phpunit/integration/includes/Storage/RevertedTagUpdateIntegrationTest.php +++ b/tests/phpunit/integration/includes/Storage/RevertedTagUpdateIntegrationTest.php @@ -3,8 +3,8 @@ namespace MediaWiki\Tests\Storage; use ChangeTags; -use FormatJson; use MediaWiki\Deferred\DeferredUpdates; +use MediaWiki\Json\FormatJson; use MediaWiki\MainConfigNames; use MediaWikiIntegrationTestCase; use RecentChange; diff --git a/tests/phpunit/unit/includes/Storage/EditResultCacheTest.php b/tests/phpunit/unit/includes/Storage/EditResultCacheTest.php index 490a4d7df999..bb1ef51fd1f5 100644 --- a/tests/phpunit/unit/includes/Storage/EditResultCacheTest.php +++ b/tests/phpunit/unit/includes/Storage/EditResultCacheTest.php @@ -3,8 +3,8 @@ namespace MediaWiki\Tests\Storage; use BagOStuff; -use FormatJson; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Json\FormatJson; use MediaWiki\MainConfigNames; use MediaWiki\Storage\EditResult; use MediaWiki\Storage\EditResultCache; diff --git a/tests/phpunit/unit/includes/Storage/EditResultTest.php b/tests/phpunit/unit/includes/Storage/EditResultTest.php index e5d077733b8b..b74bc9959ed8 100644 --- a/tests/phpunit/unit/includes/Storage/EditResultTest.php +++ b/tests/phpunit/unit/includes/Storage/EditResultTest.php @@ -2,7 +2,7 @@ namespace MediaWiki\Tests\Storage; -use FormatJson; +use MediaWiki\Json\FormatJson; use MediaWiki\Storage\EditResult; use MediaWikiUnitTestCase; diff --git a/tests/phpunit/unit/includes/Storage/RevertedTagUpdateTest.php b/tests/phpunit/unit/includes/Storage/RevertedTagUpdateTest.php index 9789d6b9cc56..750485655e89 100644 --- a/tests/phpunit/unit/includes/Storage/RevertedTagUpdateTest.php +++ b/tests/phpunit/unit/includes/Storage/RevertedTagUpdateTest.php @@ -3,9 +3,9 @@ namespace MediaWiki\Tests\Storage; use ChangeTags; -use FormatJson; use MediaWiki\ChangeTags\ChangeTagsStore; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Json\FormatJson; use MediaWiki\MainConfigNames; use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\RevisionRecord; diff --git a/tests/phpunit/unit/includes/json/FormatJsonTest.php b/tests/phpunit/unit/includes/json/FormatJsonTest.php index f3320e619810..7fd7ec68cbcc 100644 --- a/tests/phpunit/unit/includes/json/FormatJsonTest.php +++ b/tests/phpunit/unit/includes/json/FormatJsonTest.php @@ -1,7 +1,9 @@ <?php +use MediaWiki\Json\FormatJson; + /** - * @covers \FormatJson + * @covers \MediaWiki\Json\FormatJson */ class FormatJsonTest extends MediaWikiUnitTestCase { @@ -223,7 +225,7 @@ class FormatJsonTest extends MediaWikiUnitTestCase { } /** - * @covers \FormatJson::stripComments + * @covers \MediaWiki\Json\FormatJson::stripComments * @dataProvider provideStripComments * @param string $json * @param string $expect @@ -241,8 +243,8 @@ class FormatJsonTest extends MediaWikiUnitTestCase { } /** - * @covers \FormatJson::parse - * @covers \FormatJson::stripComments + * @covers \MediaWiki\Json\FormatJson::parse + * @covers \MediaWiki\Json\FormatJson::stripComments * @dataProvider provideParseStripComments */ public function testParseStripComments( $json, $expect ) { @@ -336,8 +338,8 @@ class FormatJsonTest extends MediaWikiUnitTestCase { } /** - * @covers \FormatJson::encode - * @covers \FormatJson::decode + * @covers \MediaWiki\Json\FormatJson::encode + * @covers \MediaWiki\Json\FormatJson::decode * @dataProvider provideEmptyJsonKeyStrings * * Decoding behavior with empty keys can be surprising. diff --git a/tests/phpunit/unit/includes/json/JsonCodecTest.php b/tests/phpunit/unit/includes/json/JsonCodecTest.php index 0ee4df0662c8..21d00ea8768a 100644 --- a/tests/phpunit/unit/includes/json/JsonCodecTest.php +++ b/tests/phpunit/unit/includes/json/JsonCodecTest.php @@ -2,10 +2,10 @@ namespace MediaWiki\Tests\Json; -use FormatJson; use InvalidArgumentException; use JsonException; use JsonSerializable; +use MediaWiki\Json\FormatJson; use MediaWiki\Json\JsonCodec; use MediaWiki\Json\JsonConstants; use MediaWiki\Title\Title; diff --git a/tests/phpunit/unit/includes/language/LanguageTest.php b/tests/phpunit/unit/includes/language/LanguageTest.php index 0e93ab49c130..42e1d66c29a6 100644 --- a/tests/phpunit/unit/includes/language/LanguageTest.php +++ b/tests/phpunit/unit/includes/language/LanguageTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\Config\HashConfig; +use MediaWiki\Json\FormatJson; use MediaWiki\Languages\LanguageConverterFactory; use MediaWiki\Languages\LanguageFallback; use MediaWiki\Languages\LanguageNameUtils; diff --git a/tests/phpunit/unit/includes/registration/ExtensionProcessorTest.php b/tests/phpunit/unit/includes/registration/ExtensionProcessorTest.php index 65ab5c7eadeb..5fcfba9410fa 100644 --- a/tests/phpunit/unit/includes/registration/ExtensionProcessorTest.php +++ b/tests/phpunit/unit/includes/registration/ExtensionProcessorTest.php @@ -5,8 +5,8 @@ namespace MediaWiki\Tests\Registration; use Exception; use ExtensionProcessor; use ExtensionRegistry; -use FormatJson; use InvalidArgumentException; +use MediaWiki\Json\FormatJson; use MediaWikiUnitTestCase; use RuntimeException; use UnexpectedValueException; diff --git a/tests/phpunit/unit/includes/utils/MWRestrictionsTest.php b/tests/phpunit/unit/includes/utils/MWRestrictionsTest.php index 0d04e45add39..82b1953fe30d 100644 --- a/tests/phpunit/unit/includes/utils/MWRestrictionsTest.php +++ b/tests/phpunit/unit/includes/utils/MWRestrictionsTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Json\FormatJson; use MediaWiki\Request\FauxRequest; use MediaWiki\Request\WebRequest; use MediaWiki\Status\Status; |