diff options
68 files changed, 84 insertions, 36 deletions
diff --git a/autoload.php b/autoload.php index 21c69d2d47b2..7935adf45d80 100644 --- a/autoload.php +++ b/autoload.php @@ -1581,6 +1581,7 @@ $wgAutoloadLocalClasses = [ 'MediaWiki\\Interwiki\\NullInterwikiLookup' => __DIR__ . '/includes/interwiki/NullInterwikiLookup.php', 'MediaWiki\\JobQueue\\JobFactory' => __DIR__ . '/includes/jobqueue/JobFactory.php', 'MediaWiki\\JobQueue\\JobQueueGroupFactory' => __DIR__ . '/includes/jobqueue/JobQueueGroupFactory.php', + 'MediaWiki\\Json\\FormatJson' => __DIR__ . '/includes/json/FormatJson.php', 'MediaWiki\\Json\\JsonCodec' => __DIR__ . '/includes/json/JsonCodec.php', 'MediaWiki\\Json\\JsonConstants' => __DIR__ . '/includes/json/JsonConstants.php', 'MediaWiki\\Json\\JsonSerializer' => __DIR__ . '/includes/json/JsonSerializer.php', diff --git a/includes/CommentStore/CommentStore.php b/includes/CommentStore/CommentStore.php index 9fbbbf2fea36..3c6b742dd4a9 100644 --- a/includes/CommentStore/CommentStore.php +++ b/includes/CommentStore/CommentStore.php @@ -20,9 +20,9 @@ namespace MediaWiki\CommentStore; -use FormatJson; use InvalidArgumentException; use Language; +use MediaWiki\Json\FormatJson; use MediaWiki\Language\RawMessage; use MediaWiki\Message\Message; use OverflowException; diff --git a/includes/Html/Html.php b/includes/Html/Html.php index f1cc59be59d6..8492150e7df9 100644 --- a/includes/Html/Html.php +++ b/includes/Html/Html.php @@ -25,7 +25,7 @@ namespace MediaWiki\Html; -use FormatJson; +use MediaWiki\Json\FormatJson; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Request\ContentSecurityPolicy; diff --git a/includes/ResourceLoader/MessageBlobStore.php b/includes/ResourceLoader/MessageBlobStore.php index c9e0f87d8c93..95d157e18edc 100644 --- a/includes/ResourceLoader/MessageBlobStore.php +++ b/includes/ResourceLoader/MessageBlobStore.php @@ -22,7 +22,7 @@ namespace MediaWiki\ResourceLoader; -use FormatJson; +use MediaWiki\Json\FormatJson; use MediaWiki\MediaWikiServices; use Psr\Log\LoggerAwareInterface; use Psr\Log\LoggerInterface; diff --git a/includes/ResourceLoader/WikiModule.php b/includes/ResourceLoader/WikiModule.php index 8887aa73d8f8..0f0344736b33 100644 --- a/includes/ResourceLoader/WikiModule.php +++ b/includes/ResourceLoader/WikiModule.php @@ -24,7 +24,7 @@ namespace MediaWiki\ResourceLoader; use Content; use CSSJanus; -use FormatJson; +use MediaWiki\Json\FormatJson; use MediaWiki\Linker\LinkTarget; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; diff --git a/includes/Rest/Handler/UpdateHandler.php b/includes/Rest/Handler/UpdateHandler.php index 5948079dd6e1..091fd9413625 100644 --- a/includes/Rest/Handler/UpdateHandler.php +++ b/includes/Rest/Handler/UpdateHandler.php @@ -2,8 +2,8 @@ namespace MediaWiki\Rest\Handler; -use FormatJson; use IApiMessage; +use MediaWiki\Json\FormatJson; use MediaWiki\Rest\LocalizedHttpException; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; diff --git a/includes/Rest/Validator/JsonBodyValidator.php b/includes/Rest/Validator/JsonBodyValidator.php index 5dddb7e7a3b7..274859b27d1d 100644 --- a/includes/Rest/Validator/JsonBodyValidator.php +++ b/includes/Rest/Validator/JsonBodyValidator.php @@ -2,7 +2,7 @@ namespace MediaWiki\Rest\Validator; -use FormatJson; +use MediaWiki\Json\FormatJson; use MediaWiki\Rest\LocalizedHttpException; use MediaWiki\Rest\RequestInterface; use Wikimedia\Message\ListParam; diff --git a/includes/Storage/EditResultCache.php b/includes/Storage/EditResultCache.php index d0b48dbf79e1..04e04f2bf734 100644 --- a/includes/Storage/EditResultCache.php +++ b/includes/Storage/EditResultCache.php @@ -21,8 +21,8 @@ namespace MediaWiki\Storage; use BagOStuff; -use FormatJson; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Json\FormatJson; use MediaWiki\MainConfigNames; use Wikimedia\Rdbms\IConnectionProvider; diff --git a/includes/Storage/RevertedTagUpdate.php b/includes/Storage/RevertedTagUpdate.php index e97044fcaabc..d89260ea2b2c 100644 --- a/includes/Storage/RevertedTagUpdate.php +++ b/includes/Storage/RevertedTagUpdate.php @@ -21,10 +21,10 @@ namespace MediaWiki\Storage; use ChangeTags; -use FormatJson; use MediaWiki\ChangeTags\ChangeTagsStore; use MediaWiki\Config\ServiceOptions; use MediaWiki\Deferred\DeferrableUpdate; +use MediaWiki\Json\FormatJson; use MediaWiki\MainConfigNames; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionStore; diff --git a/includes/api/ApiCSPReport.php b/includes/api/ApiCSPReport.php index 760c03a837d7..2d92bfd95208 100644 --- a/includes/api/ApiCSPReport.php +++ b/includes/api/ApiCSPReport.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\Json\FormatJson; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; use MediaWiki\Request\ContentSecurityPolicy; diff --git a/includes/api/ApiExpandTemplates.php b/includes/api/ApiExpandTemplates.php index c16048543b9f..3a3a32b6e6d0 100644 --- a/includes/api/ApiExpandTemplates.php +++ b/includes/api/ApiExpandTemplates.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\Json\FormatJson; use MediaWiki\Parser\Parser; use MediaWiki\Revision\RevisionStore; use MediaWiki\Title\Title; diff --git a/includes/api/ApiFormatBase.php b/includes/api/ApiFormatBase.php index eff8f1b7ff77..a7dc1d1ccab8 100644 --- a/includes/api/ApiFormatBase.php +++ b/includes/api/ApiFormatBase.php @@ -21,6 +21,7 @@ */ use MediaWiki\Html\Html; +use MediaWiki\Json\FormatJson; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Output\OutputPage; diff --git a/includes/api/ApiFormatJson.php b/includes/api/ApiFormatJson.php index 5fde88222533..e98683c7bde7 100644 --- a/includes/api/ApiFormatJson.php +++ b/includes/api/ApiFormatJson.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\Json\FormatJson; use Wikimedia\ParamValidator\ParamValidator; /** diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php index cb6aa1adcbc2..0627b1048f43 100644 --- a/includes/api/ApiHelp.php +++ b/includes/api/ApiHelp.php @@ -24,6 +24,7 @@ use MediaWiki\Context\DerivativeContext; use MediaWiki\Context\IContextSource; use MediaWiki\Html\Html; use MediaWiki\Html\HtmlHelper; +use MediaWiki\Json\FormatJson; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Output\OutputPage; diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php index 06a4494bf815..3b55a8973ec1 100644 --- a/includes/api/ApiParse.php +++ b/includes/api/ApiParse.php @@ -27,6 +27,7 @@ use MediaWiki\Content\IContentHandlerFactory; use MediaWiki\Content\Renderer\ContentRenderer; use MediaWiki\Content\Transform\ContentTransformer; use MediaWiki\EditPage\EditPage; +use MediaWiki\Json\FormatJson; use MediaWiki\Language\RawMessage; use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\Output\OutputPage; diff --git a/includes/changes/RecentChange.php b/includes/changes/RecentChange.php index 836c926cd5f3..0bb90322e7e5 100644 --- a/includes/changes/RecentChange.php +++ b/includes/changes/RecentChange.php @@ -25,6 +25,7 @@ use MediaWiki\Config\Config; use MediaWiki\Debug\DeprecationHelper; use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\HookContainer\HookRunner; +use MediaWiki\Json\FormatJson; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageIdentity; diff --git a/includes/content/JsonContent.php b/includes/content/JsonContent.php index f868c1d046fa..4e72f82a4623 100644 --- a/includes/content/JsonContent.php +++ b/includes/content/JsonContent.php @@ -9,6 +9,7 @@ */ use MediaWiki\Html\Html; +use MediaWiki\Json\FormatJson; use MediaWiki\Status\Status; /** diff --git a/includes/exception/MWExceptionHandler.php b/includes/exception/MWExceptionHandler.php index 091c32e2e4b7..0c31ff062902 100644 --- a/includes/exception/MWExceptionHandler.php +++ b/includes/exception/MWExceptionHandler.php @@ -20,6 +20,7 @@ use MediaWiki\Debug\MWDebug; use MediaWiki\HookContainer\HookRunner; +use MediaWiki\Json\FormatJson; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MediaWikiServices; use MediaWiki\Request\WebRequest; diff --git a/includes/filerepo/ForeignAPIRepo.php b/includes/filerepo/ForeignAPIRepo.php index f9cf2b84a6c5..7aa148d26464 100644 --- a/includes/filerepo/ForeignAPIRepo.php +++ b/includes/filerepo/ForeignAPIRepo.php @@ -18,6 +18,7 @@ * @file */ +use MediaWiki\Json\FormatJson; use MediaWiki\Linker\LinkTarget; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php index 572de80a6d29..c5e267588742 100644 --- a/includes/htmlform/HTMLFormField.php +++ b/includes/htmlform/HTMLFormField.php @@ -2,13 +2,13 @@ namespace MediaWiki\HTMLForm; -use FormatJson; use HtmlArmor; use HTMLCheckField; use HTMLFormFieldCloner; use InvalidArgumentException; use MediaWiki\Context\RequestContext; use MediaWiki\Html\Html; +use MediaWiki\Json\FormatJson; use MediaWiki\Linker\Linker; use MediaWiki\Logger\LoggerFactory; use MediaWiki\Message\Message; diff --git a/includes/htmlform/fields/HTMLAutoCompleteSelectField.php b/includes/htmlform/fields/HTMLAutoCompleteSelectField.php index 88a7960a24c8..840c82bf6c3b 100644 --- a/includes/htmlform/fields/HTMLAutoCompleteSelectField.php +++ b/includes/htmlform/fields/HTMLAutoCompleteSelectField.php @@ -2,9 +2,9 @@ namespace MediaWiki\HTMLForm\Field; -use FormatJson; use InvalidArgumentException; use MediaWiki\HTMLForm\HTMLFormField; +use MediaWiki\Json\FormatJson; use MediaWiki\Xml\XmlSelect; /** diff --git a/includes/htmlform/fields/HTMLCheckMatrix.php b/includes/htmlform/fields/HTMLCheckMatrix.php index 2743b6b3802e..120a88a18f18 100644 --- a/includes/htmlform/fields/HTMLCheckMatrix.php +++ b/includes/htmlform/fields/HTMLCheckMatrix.php @@ -2,11 +2,11 @@ namespace MediaWiki\HTMLForm\Field; -use FormatJson; use MediaWiki\Html\Html; use MediaWiki\HTMLForm\HTMLFormField; use MediaWiki\HTMLForm\HTMLFormFieldRequiredOptionsException; use MediaWiki\HTMLForm\HTMLNestedFilterable; +use MediaWiki\Json\FormatJson; use MediaWiki\Request\WebRequest; use MediaWiki\Xml\Xml; diff --git a/includes/htmlform/fields/HTMLTitleTextField.php b/includes/htmlform/fields/HTMLTitleTextField.php index 84544e4f3067..6ae38c12b4d9 100644 --- a/includes/htmlform/fields/HTMLTitleTextField.php +++ b/includes/htmlform/fields/HTMLTitleTextField.php @@ -2,8 +2,8 @@ namespace MediaWiki\HTMLForm\Field; -use FormatJson; use InvalidArgumentException; +use MediaWiki\Json\FormatJson; use MediaWiki\MediaWikiServices; use MediaWiki\Title\MalformedTitleException; use MediaWiki\Title\Title; diff --git a/includes/installer/Pingback.php b/includes/installer/Pingback.php index 62a75b524b17..7a5f2df00845 100644 --- a/includes/installer/Pingback.php +++ b/includes/installer/Pingback.php @@ -21,9 +21,9 @@ namespace MediaWiki\Installer; use BagOStuff; -use FormatJson; use MediaWiki\Config\Config; use MediaWiki\Http\HttpRequestFactory; +use MediaWiki\Json\FormatJson; use MediaWiki\MainConfigNames; use MWCryptRand; use Psr\Log\LoggerInterface; diff --git a/includes/installer/WebInstallerName.php b/includes/installer/WebInstallerName.php index e94b5ae81e1b..cbd7303b8fcc 100644 --- a/includes/installer/WebInstallerName.php +++ b/includes/installer/WebInstallerName.php @@ -22,8 +22,8 @@ namespace MediaWiki\Installer; -use FormatJson; use MediaWiki\Config\HashConfig; +use MediaWiki\Json\FormatJson; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Parser\Sanitizer; diff --git a/includes/jobqueue/Job.php b/includes/jobqueue/Job.php index f8192eac1fd3..8976396b9e3c 100644 --- a/includes/jobqueue/Job.php +++ b/includes/jobqueue/Job.php @@ -19,6 +19,7 @@ */ use MediaWiki\Http\Telemetry; +use MediaWiki\Json\FormatJson; use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageReference; use MediaWiki\Title\Title; diff --git a/includes/json/FormatJson.php b/includes/json/FormatJson.php index 06155b65b978..248321a1ae6c 100644 --- a/includes/json/FormatJson.php +++ b/includes/json/FormatJson.php @@ -20,6 +20,8 @@ * @file */ +namespace MediaWiki\Json; + use MediaWiki\Status\Status; /** @@ -296,3 +298,5 @@ class FormatJson { return $buffer . substr( $str, $mark, $maxLen - $mark ); } } +/** @deprecated class alias since 1.43 */ +class_alias( FormatJson::class, 'FormatJson' ); diff --git a/includes/json/JsonCodec.php b/includes/json/JsonCodec.php index 7dc1a0092c78..4005dcdca9c0 100644 --- a/includes/json/JsonCodec.php +++ b/includes/json/JsonCodec.php @@ -21,7 +21,6 @@ namespace MediaWiki\Json; -use FormatJson; use JsonException; use JsonSerializable; use MediaWiki\Parser\ParserOutput; diff --git a/includes/language/Language.php b/includes/language/Language.php index b8420d3d4f5c..9365a55e9b6f 100644 --- a/includes/language/Language.php +++ b/includes/language/Language.php @@ -34,6 +34,7 @@ use MediaWiki\Config\Config; use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; +use MediaWiki\Json\FormatJson; use MediaWiki\Languages\Data\NormalizeAr; use MediaWiki\Languages\Data\NormalizeMl; use MediaWiki\Languages\LanguageConverterFactory; diff --git a/includes/language/LocalisationCache.php b/includes/language/LocalisationCache.php index f6f98365c820..5470a7309778 100644 --- a/includes/language/LocalisationCache.php +++ b/includes/language/LocalisationCache.php @@ -23,6 +23,7 @@ use CLDRPluralRuleParser\Evaluator; use MediaWiki\Config\ServiceOptions; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; +use MediaWiki\Json\FormatJson; use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\MainConfigNames; use Psr\Log\LoggerInterface; diff --git a/includes/libs/filebackend/FileBackendMultiWrite.php b/includes/libs/filebackend/FileBackendMultiWrite.php index 3b74e4b56d65..955c802b3f32 100644 --- a/includes/libs/filebackend/FileBackendMultiWrite.php +++ b/includes/libs/filebackend/FileBackendMultiWrite.php @@ -22,6 +22,7 @@ */ use MediaWiki\Deferred\DeferredUpdates; +use MediaWiki\Json\FormatJson; use Wikimedia\Timestamp\ConvertibleTimestamp; /** diff --git a/includes/libs/filebackend/FileBackendStore.php b/includes/libs/filebackend/FileBackendStore.php index 8028f5e37b18..d625d5554b66 100644 --- a/includes/libs/filebackend/FileBackendStore.php +++ b/includes/libs/filebackend/FileBackendStore.php @@ -21,6 +21,7 @@ * @ingroup FileBackend */ +use MediaWiki\Json\FormatJson; use Wikimedia\AtEase\AtEase; use Wikimedia\Timestamp\ConvertibleTimestamp; diff --git a/includes/libs/filebackend/SwiftFileBackend.php b/includes/libs/filebackend/SwiftFileBackend.php index 6addbfd4fc38..4b54345f2b48 100644 --- a/includes/libs/filebackend/SwiftFileBackend.php +++ b/includes/libs/filebackend/SwiftFileBackend.php @@ -22,6 +22,7 @@ * @author Russ Nelson */ +use MediaWiki\Json\FormatJson; use MediaWiki\Utils\MWTimestamp; use Psr\Log\LoggerInterface; use Wikimedia\AtEase\AtEase; diff --git a/includes/libs/filebackend/fileop/FileOp.php b/includes/libs/filebackend/fileop/FileOp.php index b761795656bd..781ac06caa24 100644 --- a/includes/libs/filebackend/fileop/FileOp.php +++ b/includes/libs/filebackend/fileop/FileOp.php @@ -20,6 +20,8 @@ * @file * @ingroup FileBackend */ + +use MediaWiki\Json\FormatJson; use Psr\Log\LoggerInterface; use Wikimedia\RequestTimeout\TimeoutException; diff --git a/includes/rcfeed/JSONRCFeedFormatter.php b/includes/rcfeed/JSONRCFeedFormatter.php index 6d86da6c45b7..e6fc62780267 100644 --- a/includes/rcfeed/JSONRCFeedFormatter.php +++ b/includes/rcfeed/JSONRCFeedFormatter.php @@ -19,6 +19,8 @@ * @file */ +use MediaWiki\Json\FormatJson; + /** * Format a recent change notification using JSON (https://www.json.org). * diff --git a/includes/site/MediaWikiPageNameNormalizer.php b/includes/site/MediaWikiPageNameNormalizer.php index 73e2a6282676..aff7710cb4fe 100644 --- a/includes/site/MediaWikiPageNameNormalizer.php +++ b/includes/site/MediaWikiPageNameNormalizer.php @@ -20,9 +20,9 @@ namespace MediaWiki\Site; -use FormatJson; use InvalidArgumentException; use MediaWiki\Http\HttpRequestFactory; +use MediaWiki\Json\FormatJson; use MediaWiki\MediaWikiServices; use UtfNormal\Validator; diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php index 715d1691c4cc..9b02494b5522 100644 --- a/includes/specialpage/ChangesListSpecialPage.php +++ b/includes/specialpage/ChangesListSpecialPage.php @@ -25,11 +25,11 @@ use ChangesListBooleanFilterGroup; use ChangesListFilterGroup; use ChangesListStringOptionsFilterGroup; use ChangeTags; -use FormatJson; use LogFormatter; use MediaWiki\Context\IContextSource; use MediaWiki\Html\FormOptions; use MediaWiki\Html\Html; +use MediaWiki\Json\FormatJson; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Parser\Sanitizer; diff --git a/includes/specials/SpecialRunJobs.php b/includes/specials/SpecialRunJobs.php index 01e09c72a8c8..8c3fff8e4915 100644 --- a/includes/specials/SpecialRunJobs.php +++ b/includes/specials/SpecialRunJobs.php @@ -20,11 +20,11 @@ namespace MediaWiki\Specials; -use FormatJson; use HttpStatus; use JobRunner; use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Deferred\TransactionRoundDefiningUpdate; +use MediaWiki\Json\FormatJson; use MediaWiki\MainConfigNames; use MediaWiki\SpecialPage\UnlistedSpecialPage; use Wikimedia\Rdbms\ReadOnlyMode; diff --git a/includes/user/BotPassword.php b/includes/user/BotPassword.php index 40ac11a255a4..70ded87ba54b 100644 --- a/includes/user/BotPassword.php +++ b/includes/user/BotPassword.php @@ -20,13 +20,13 @@ namespace MediaWiki\User; -use FormatJson; use IDBAccessObject; use InvalidPassword; use MediaWiki\Auth\AuthenticationResponse; use MediaWiki\Auth\Throttler; use MediaWiki\Config\Config; use MediaWiki\HookContainer\HookRunner; +use MediaWiki\Json\FormatJson; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Request\WebRequest; diff --git a/includes/user/BotPasswordStore.php b/includes/user/BotPasswordStore.php index 9c43dfce519f..ba81cacf79ad 100644 --- a/includes/user/BotPasswordStore.php +++ b/includes/user/BotPasswordStore.php @@ -22,9 +22,9 @@ namespace MediaWiki\User; -use FormatJson; use IDBAccessObject; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Json\FormatJson; use MediaWiki\MainConfigNames; use MediaWiki\User\CentralId\CentralIdLookup; use MWCryptRand; diff --git a/includes/utils/AutoloadGenerator.php b/includes/utils/AutoloadGenerator.php index a98d08c0af0a..89047c6279b4 100644 --- a/includes/utils/AutoloadGenerator.php +++ b/includes/utils/AutoloadGenerator.php @@ -18,6 +18,8 @@ * @file */ +use MediaWiki\Json\FormatJson; + /** * Accepts a list of files and directories to search for * php files and generates $wgAutoloadLocalClasses or $wgAutoloadClasses diff --git a/includes/utils/GitInfo.php b/includes/utils/GitInfo.php index 96be26a19b63..d88b674961dd 100644 --- a/includes/utils/GitInfo.php +++ b/includes/utils/GitInfo.php @@ -20,9 +20,9 @@ namespace MediaWiki\Utils; -use FormatJson; use MediaWiki\Config\ServiceOptions; use MediaWiki\HookContainer\HookRunner; +use MediaWiki\Json\FormatJson; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; diff --git a/includes/utils/MWRestrictions.php b/includes/utils/MWRestrictions.php index 4d8083ada2e0..0c782c502ed8 100644 --- a/includes/utils/MWRestrictions.php +++ b/includes/utils/MWRestrictions.php @@ -18,6 +18,7 @@ * http://www.gnu.org/copyleft/gpl.html */ +use MediaWiki\Json\FormatJson; use MediaWiki\Linker\LinkTarget; use MediaWiki\Request\WebRequest; use MediaWiki\Status\Status; diff --git a/maintenance/convertExtensionToRegistration.php b/maintenance/convertExtensionToRegistration.php index 317114acbbd2..46cb0ccb23e2 100644 --- a/maintenance/convertExtensionToRegistration.php +++ b/maintenance/convertExtensionToRegistration.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Json\FormatJson; use Wikimedia\Composer\ComposerJson; require_once __DIR__ . '/Maintenance.php'; diff --git a/maintenance/convertExtensionsMessagesToTranslationAlias.php b/maintenance/convertExtensionsMessagesToTranslationAlias.php index c805bbe6f416..4823f0ed94e6 100644 --- a/maintenance/convertExtensionsMessagesToTranslationAlias.php +++ b/maintenance/convertExtensionsMessagesToTranslationAlias.php @@ -1,5 +1,7 @@ <?php +use MediaWiki\Json\FormatJson; + require_once __DIR__ . '/Maintenance.php'; /** diff --git a/maintenance/generateJsonI18n.php b/maintenance/generateJsonI18n.php index a9f0f814eb75..f6160d49ced3 100644 --- a/maintenance/generateJsonI18n.php +++ b/maintenance/generateJsonI18n.php @@ -25,6 +25,8 @@ * @ingroup Maintenance */ +use MediaWiki\Json\FormatJson; + require_once __DIR__ . '/Maintenance.php'; /** diff --git a/maintenance/getConfiguration.php b/maintenance/getConfiguration.php index 14367d3596d0..bf4dff5da635 100644 --- a/maintenance/getConfiguration.php +++ b/maintenance/getConfiguration.php @@ -23,6 +23,8 @@ * @author Antoine Musso <hashar@free.fr> */ +use MediaWiki\Json\FormatJson; + require_once __DIR__ . '/Maintenance.php'; /** diff --git a/maintenance/importSiteScripts.php b/maintenance/importSiteScripts.php index d98a240c6aba..eeafea8a71c0 100644 --- a/maintenance/importSiteScripts.php +++ b/maintenance/importSiteScripts.php @@ -21,6 +21,7 @@ * @ingroup Maintenance */ +use MediaWiki\Json\FormatJson; use MediaWiki\StubObject\StubGlobalUser; use MediaWiki\Title\Title; use MediaWiki\User\User; diff --git a/maintenance/language/importExtensionMessages.php b/maintenance/language/importExtensionMessages.php index 1459885c766a..7447ee4d21c1 100644 --- a/maintenance/language/importExtensionMessages.php +++ b/maintenance/language/importExtensionMessages.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Json\FormatJson; use MediaWiki\MainConfigNames; require_once __DIR__ . '/../Maintenance.php'; diff --git a/maintenance/language/listVariants.php b/maintenance/language/listVariants.php index 37e622a5e6b1..9c0d034d6794 100644 --- a/maintenance/language/listVariants.php +++ b/maintenance/language/listVariants.php @@ -24,6 +24,8 @@ * @ingroup Maintenance */ +use MediaWiki\Json\FormatJson; + require_once dirname( __DIR__ ) . '/Maintenance.php'; /** diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php index f1f27d4675d0..ba635222e62d 100644 --- a/maintenance/runJobs.php +++ b/maintenance/runJobs.php @@ -23,6 +23,7 @@ require_once __DIR__ . '/Maintenance.php'; +use MediaWiki\Json\FormatJson; use MediaWiki\Maintenance\ForkController; use MediaWiki\Settings\SettingsBuilder; diff --git a/maintenance/updateExtensionJsonSchema.php b/maintenance/updateExtensionJsonSchema.php index 1505ce80752f..eee06ff91be7 100644 --- a/maintenance/updateExtensionJsonSchema.php +++ b/maintenance/updateExtensionJsonSchema.php @@ -1,6 +1,7 @@ <?php use Composer\Semver\VersionParser; +use MediaWiki\Json\FormatJson; require_once __DIR__ . '/Maintenance.php'; diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php index 07653474cd83..7cc13106b028 100644 --- a/tests/parser/ParserTestRunner.php +++ b/tests/parser/ParserTestRunner.php @@ -31,6 +31,7 @@ use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Html\Html; use MediaWiki\Interwiki\ClassicInterwikiLookup; +use MediaWiki\Json\FormatJson; use MediaWiki\Linker\LinkTarget; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; 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; diff --git a/tests/qunit/data/generateJqueryMsgData.php b/tests/qunit/data/generateJqueryMsgData.php index b7b202da0048..f4cb3fdb0a55 100644 --- a/tests/qunit/data/generateJqueryMsgData.php +++ b/tests/qunit/data/generateJqueryMsgData.php @@ -7,6 +7,7 @@ * mapping expected inputs to outputs, which is used then run by QUnit. */ +use MediaWiki\Json\FormatJson; use MediaWiki\Languages\LanguageFactory; require __DIR__ . '/../../../maintenance/Maintenance.php'; |