From c9f73efd5a8f742d4799f51cac3bfeaaa3928dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20Dziewo=C5=84ski?= Date: Sun, 28 Jul 2024 14:06:24 +0200 Subject: [PATCH] Namespace MessageSpecifier under Wikimedia\Message\ In change I625a48a6ecd3fad5c2ed76b23343a0fef91e1b83 I am planning to make Wikimedia\Message\MessageValue use it, and we try to pretend that it is a library separate from MediaWiki, so it makes sense to move MessageSpecifier to the same namespace under Wikimedia\. Bug: T353458 Change-Id: I9ff4ff7beb098b60c92f564591937c7d789c6684 --- RELEASE-NOTES-1.43 | 2 ++ autoload.php | 3 ++- includes/GlobalFunctions.php | 1 + includes/Message/Converter.php | 2 +- includes/Message/Message.php | 2 +- includes/Output/OutputPage.php | 2 +- .../Hook/GetUserPermissionsErrorsExpensiveHook.php | 2 +- includes/Permissions/Hook/GetUserPermissionsErrorsHook.php | 2 +- includes/Permissions/PermissionManager.php | 2 +- includes/ResourceLoader/Context.php | 2 +- includes/Status/StatusFormatter.php | 2 +- includes/actions/Action.php | 1 + includes/api/ApiBase.php | 1 + includes/api/ApiErrorFormatter.php | 1 + includes/api/ApiMain.php | 1 + includes/api/ApiMessage.php | 1 + includes/api/ApiUpload.php | 1 + includes/api/ApiUsageException.php | 1 + includes/api/IApiMessage.php | 2 ++ includes/context/ContextSource.php | 2 +- includes/context/DerivativeContext.php | 2 +- includes/context/RequestContext.php | 2 +- includes/exception/ErrorPageError.php | 1 + includes/exception/LocalizedException.php | 1 + includes/exception/MWExceptionRenderer.php | 1 + includes/filerepo/ThumbnailEntryPoint.php | 2 +- includes/htmlform/HTMLForm.php | 2 +- includes/htmlform/HTMLFormField.php | 2 +- includes/installer/CliInstaller.php | 2 +- includes/installer/Installer.php | 2 +- includes/language/MessageLocalizer.php | 1 + includes/libs/{ => Message}/MessageSpecifier.php | 7 +++++++ includes/libs/StatusValue.php | 1 + includes/libs/rdbms/exception/DBExpectedError.php | 2 +- includes/mail/EmailUser.php | 2 +- includes/skins/SkinTemplate.php | 1 + includes/specialpage/SpecialPage.php | 2 +- includes/specials/Hook/EmailUserHook.php | 2 +- includes/specials/SpecialBlock.php | 2 +- includes/upload/Hook/UploadStashFileHook.php | 2 +- includes/upload/Hook/UploadVerifyFileHook.php | 2 +- includes/upload/Hook/UploadVerifyUploadHook.php | 2 +- includes/upload/exception/UploadStashException.php | 1 + includes/user/Hook/IsValidPasswordHook.php | 2 +- includes/user/Hook/SpecialPasswordResetOnSubmitHook.php | 2 +- tests/phpunit/includes/Status/StatusTest.php | 1 + tests/phpunit/includes/api/ApiBaseTest.php | 2 +- tests/phpunit/includes/auth/AuthManagerTest.php | 2 +- tests/phpunit/includes/language/MessageTest.php | 1 + tests/phpunit/mocks/MockMessageLocalizer.php | 1 + 50 files changed, 59 insertions(+), 29 deletions(-) rename includes/libs/{ => Message}/MessageSpecifier.php (91%) diff --git a/RELEASE-NOTES-1.43 b/RELEASE-NOTES-1.43 index 3a48ece4680..2814fe9aa97 100644 --- a/RELEASE-NOTES-1.43 +++ b/RELEASE-NOTES-1.43 @@ -385,6 +385,8 @@ because of Phabricator reports. - FileBackend - Wikimedia\Http: - MultiHttpClient + - Wikimedia\Message: + - MessageSpecifier - Wikimedia\ObjectCache: - APCUBagOStuff - BagOStuff diff --git a/autoload.php b/autoload.php index 6baa2b851a8..6f06472a351 100644 --- a/autoload.php +++ b/autoload.php @@ -2598,7 +2598,7 @@ $wgAutoloadLocalClasses = [ 'MessageCacheUpdate' => __DIR__ . '/includes/deferred/MessageCacheUpdate.php', 'MessageContent' => __DIR__ . '/includes/content/MessageContent.php', 'MessageLocalizer' => __DIR__ . '/includes/language/MessageLocalizer.php', - 'MessageSpecifier' => __DIR__ . '/includes/libs/MessageSpecifier.php', + 'MessageSpecifier' => __DIR__ . '/includes/libs/Message/MessageSpecifier.php', 'MetadataStorageHelper' => __DIR__ . '/includes/filerepo/file/MetadataStorageHelper.php', 'MigrateBlocks' => __DIR__ . '/maintenance/migrateBlocks.php', 'MigrateExternallinks' => __DIR__ . '/maintenance/migrateExternallinks.php', @@ -3241,6 +3241,7 @@ $wgAutoloadLocalClasses = [ 'Wikimedia\\Message\\ListParam' => __DIR__ . '/includes/libs/Message/ListParam.php', 'Wikimedia\\Message\\ListType' => __DIR__ . '/includes/libs/Message/ListType.php', 'Wikimedia\\Message\\MessageParam' => __DIR__ . '/includes/libs/Message/MessageParam.php', + 'Wikimedia\\Message\\MessageSpecifier' => __DIR__ . '/includes/libs/Message/MessageSpecifier.php', 'Wikimedia\\Message\\MessageValue' => __DIR__ . '/includes/libs/Message/MessageValue.php', 'Wikimedia\\Message\\ParamType' => __DIR__ . '/includes/libs/Message/ParamType.php', 'Wikimedia\\Message\\ScalarParam' => __DIR__ . '/includes/libs/Message/ScalarParam.php', diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 4a487723d43..39de6c1fc7d 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -35,6 +35,7 @@ use MediaWiki\Utils\MWTimestamp; use MediaWiki\Utils\UrlUtils; use Wikimedia\AtEase\AtEase; use Wikimedia\FileBackend\FileBackend; +use Wikimedia\Message\MessageSpecifier; use Wikimedia\ParamValidator\TypeDef\ExpiryDef; use Wikimedia\RequestTimeout\RequestTimeout; diff --git a/includes/Message/Converter.php b/includes/Message/Converter.php index b9922f534bc..87f17b9ab34 100644 --- a/includes/Message/Converter.php +++ b/includes/Message/Converter.php @@ -3,10 +3,10 @@ namespace MediaWiki\Message; use InvalidArgumentException; -use MessageSpecifier; use ReflectionClass; use Wikimedia\Message\ListParam; use Wikimedia\Message\MessageParam; +use Wikimedia\Message\MessageSpecifier; use Wikimedia\Message\MessageValue; use Wikimedia\Message\ParamType; use Wikimedia\Message\ScalarParam; diff --git a/includes/Message/Message.php b/includes/Message/Message.php index 950e53b5545..2f07b69c995 100644 --- a/includes/Message/Message.php +++ b/includes/Message/Message.php @@ -37,12 +37,12 @@ use MediaWiki\Parser\ParserOutput; use MediaWiki\StubObject\StubUserLang; use MediaWiki\Title\Title; use MessageContent; -use MessageSpecifier; use RuntimeException; use Serializable; use Stringable; use Wikimedia\Assert\Assert; use Wikimedia\Bcp47Code\Bcp47Code; +use Wikimedia\Message\MessageSpecifier; /** * The Message class deals with fetching and processing of interface message diff --git a/includes/Output/OutputPage.php b/includes/Output/OutputPage.php index 49452019492..b5cd0ef9280 100644 --- a/includes/Output/OutputPage.php +++ b/includes/Output/OutputPage.php @@ -63,7 +63,6 @@ use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\Title\Title; use MediaWiki\Title\TitleValue; use MediaWiki\Utils\MWTimestamp; -use MessageSpecifier; use OOUI\Element; use OOUI\Theme; use ParserOptions; @@ -72,6 +71,7 @@ use Skin; use Wikimedia\AtEase\AtEase; use Wikimedia\Bcp47Code\Bcp47Code; use Wikimedia\LightweightObjectStore\ExpirationAwareness; +use Wikimedia\Message\MessageSpecifier; use Wikimedia\Parsoid\Core\TOCData; use Wikimedia\Rdbms\IResultWrapper; use Wikimedia\RelPath; diff --git a/includes/Permissions/Hook/GetUserPermissionsErrorsExpensiveHook.php b/includes/Permissions/Hook/GetUserPermissionsErrorsExpensiveHook.php index 550d4b67992..fd41f5c29ce 100644 --- a/includes/Permissions/Hook/GetUserPermissionsErrorsExpensiveHook.php +++ b/includes/Permissions/Hook/GetUserPermissionsErrorsExpensiveHook.php @@ -4,7 +4,7 @@ namespace MediaWiki\Permissions\Hook; use MediaWiki\Title\Title; use MediaWiki\User\User; -use MessageSpecifier; +use Wikimedia\Message\MessageSpecifier; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/Permissions/Hook/GetUserPermissionsErrorsHook.php b/includes/Permissions/Hook/GetUserPermissionsErrorsHook.php index 8abbdad9697..78a1c76e790 100644 --- a/includes/Permissions/Hook/GetUserPermissionsErrorsHook.php +++ b/includes/Permissions/Hook/GetUserPermissionsErrorsHook.php @@ -4,7 +4,7 @@ namespace MediaWiki\Permissions\Hook; use MediaWiki\Title\Title; use MediaWiki\User\User; -use MessageSpecifier; +use Wikimedia\Message\MessageSpecifier; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/Permissions/PermissionManager.php b/includes/Permissions/PermissionManager.php index c9bf397ec47..bcebba163bc 100644 --- a/includes/Permissions/PermissionManager.php +++ b/includes/Permissions/PermissionManager.php @@ -51,9 +51,9 @@ use MediaWiki\User\UserGroupManager; use MediaWiki\User\UserGroupMembership; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserIdentityLookup; -use MessageSpecifier; use PermissionsError; use StatusValue; +use Wikimedia\Message\MessageSpecifier; use Wikimedia\ScopedCallback; /** diff --git a/includes/ResourceLoader/Context.php b/includes/ResourceLoader/Context.php index a523cafe9b8..4496b3be304 100644 --- a/includes/ResourceLoader/Context.php +++ b/includes/ResourceLoader/Context.php @@ -32,8 +32,8 @@ use MediaWiki\User\User; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserRigorOptions; use MessageLocalizer; -use MessageSpecifier; use Psr\Log\LoggerInterface; +use Wikimedia\Message\MessageSpecifier; /** * Context object that contains information about the state of a specific diff --git a/includes/Status/StatusFormatter.php b/includes/Status/StatusFormatter.php index 932d7380247..dd60b43142f 100644 --- a/includes/Status/StatusFormatter.php +++ b/includes/Status/StatusFormatter.php @@ -28,9 +28,9 @@ use MediaWiki\Parser\ParserOutput; use MediaWiki\StubObject\StubUserLang; use MessageCache; use MessageLocalizer; -use MessageSpecifier; use StatusValue; use UnexpectedValueException; +use Wikimedia\Message\MessageSpecifier; /** * Formatter for StatusValue objects. diff --git a/includes/actions/Action.php b/includes/actions/Action.php index ba2a17df29a..d047092f90f 100644 --- a/includes/actions/Action.php +++ b/includes/actions/Action.php @@ -30,6 +30,7 @@ use MediaWiki\Permissions\Authority; use MediaWiki\Request\WebRequest; use MediaWiki\Title\Title; use MediaWiki\User\User; +use Wikimedia\Message\MessageSpecifier; /** * @defgroup Actions Actions diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php index 4c6be65213c..ac935c2f678 100644 --- a/includes/api/ApiBase.php +++ b/includes/api/ApiBase.php @@ -40,6 +40,7 @@ use MediaWiki\Status\Status; use MediaWiki\Title\Title; use MediaWiki\User\User; use MediaWiki\User\UserRigorOptions; +use Wikimedia\Message\MessageSpecifier; use Wikimedia\ParamValidator\ParamValidator; use Wikimedia\ParamValidator\TypeDef\EnumDef; use Wikimedia\ParamValidator\TypeDef\IntegerDef; diff --git a/includes/api/ApiErrorFormatter.php b/includes/api/ApiErrorFormatter.php index 98cc94ce8e0..b116f55e1da 100644 --- a/includes/api/ApiErrorFormatter.php +++ b/includes/api/ApiErrorFormatter.php @@ -26,6 +26,7 @@ use MediaWiki\Message\Message; use MediaWiki\Page\PageReference; use MediaWiki\Page\PageReferenceValue; use MediaWiki\Parser\Sanitizer; +use Wikimedia\Message\MessageSpecifier; /** * Formats errors and warnings for the API, and add them to the associated diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index f28963e108e..f176ecdd5b3 100644 --- a/includes/api/ApiMain.php +++ b/includes/api/ApiMain.php @@ -43,6 +43,7 @@ use MediaWiki\User\UserRigorOptions; use MediaWiki\Utils\MWTimestamp; use MediaWiki\WikiMap\WikiMap; use Wikimedia\AtEase\AtEase; +use Wikimedia\Message\MessageSpecifier; use Wikimedia\ParamValidator\ParamValidator; use Wikimedia\ParamValidator\TypeDef\IntegerDef; use Wikimedia\Stats\StatsFactory; diff --git a/includes/api/ApiMessage.php b/includes/api/ApiMessage.php index b6b8dce75da..39f45a2586a 100644 --- a/includes/api/ApiMessage.php +++ b/includes/api/ApiMessage.php @@ -20,6 +20,7 @@ use MediaWiki\Language\RawMessage; use MediaWiki\Message\Message; +use Wikimedia\Message\MessageSpecifier; /** * Extension of Message implementing IApiMessage diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php index 585674661af..222716661a9 100644 --- a/includes/api/ApiUpload.php +++ b/includes/api/ApiUpload.php @@ -35,6 +35,7 @@ use MediaWiki\User\Options\UserOptionsLookup; use MediaWiki\User\User; use MediaWiki\Watchlist\WatchlistManager; use Psr\Log\LoggerInterface; +use Wikimedia\Message\MessageSpecifier; use Wikimedia\ParamValidator\ParamValidator; use Wikimedia\ParamValidator\TypeDef\IntegerDef; diff --git a/includes/api/ApiUsageException.php b/includes/api/ApiUsageException.php index cf919742b7a..fe9d0cc4cdd 100644 --- a/includes/api/ApiUsageException.php +++ b/includes/api/ApiUsageException.php @@ -19,6 +19,7 @@ */ use MediaWiki\Status\Status; +use Wikimedia\Message\MessageSpecifier; /** * Exception used to abort API execution with an error diff --git a/includes/api/IApiMessage.php b/includes/api/IApiMessage.php index 32154ced5bd..f9ece12dde5 100644 --- a/includes/api/IApiMessage.php +++ b/includes/api/IApiMessage.php @@ -18,6 +18,8 @@ * @file */ +use Wikimedia\Message\MessageSpecifier; + /** * Interface for messages with machine-readable data for use by the API * diff --git a/includes/context/ContextSource.php b/includes/context/ContextSource.php index d9be95911e1..0a3b1284ae8 100644 --- a/includes/context/ContextSource.php +++ b/includes/context/ContextSource.php @@ -29,10 +29,10 @@ use MediaWiki\Request\WebRequest; use MediaWiki\Session\CsrfTokenSet; use MediaWiki\Title\Title; use MediaWiki\User\User; -use MessageSpecifier; use Skin; use Timing; use Wikimedia\Bcp47Code\Bcp47Code; +use Wikimedia\Message\MessageSpecifier; use Wikimedia\NonSerializable\NonSerializableTrait; use WikiPage; diff --git a/includes/context/DerivativeContext.php b/includes/context/DerivativeContext.php index 59607c21c41..9788545f15d 100644 --- a/includes/context/DerivativeContext.php +++ b/includes/context/DerivativeContext.php @@ -30,10 +30,10 @@ use MediaWiki\Permissions\Authority; use MediaWiki\Request\WebRequest; use MediaWiki\Title\Title; use MediaWiki\User\User; -use MessageSpecifier; use Skin; use Timing; use Wikimedia\Assert\Assert; +use Wikimedia\Message\MessageSpecifier; use WikiPage; /** diff --git a/includes/context/RequestContext.php b/includes/context/RequestContext.php index 6527ab7b935..11417f0bfdb 100644 --- a/includes/context/RequestContext.php +++ b/includes/context/RequestContext.php @@ -45,7 +45,6 @@ use MediaWiki\StubObject\StubGlobalUser; use MediaWiki\Title\Title; use MediaWiki\User\User; use MediaWiki\User\UserRigorOptions; -use MessageSpecifier; use RuntimeException; use Skin; use Timing; @@ -53,6 +52,7 @@ use Wikimedia\Assert\Assert; use Wikimedia\AtEase\AtEase; use Wikimedia\Bcp47Code\Bcp47Code; use Wikimedia\IPUtils; +use Wikimedia\Message\MessageSpecifier; use Wikimedia\NonSerializable\NonSerializableTrait; use Wikimedia\ScopedCallback; use WikiPage; diff --git a/includes/exception/ErrorPageError.php b/includes/exception/ErrorPageError.php index 3fcf06f3b56..82d9897fc5e 100644 --- a/includes/exception/ErrorPageError.php +++ b/includes/exception/ErrorPageError.php @@ -19,6 +19,7 @@ */ use MediaWiki\Message\Message; +use Wikimedia\Message\MessageSpecifier; /** * An error page which can definitely be safely rendered using the OutputPage. diff --git a/includes/exception/LocalizedException.php b/includes/exception/LocalizedException.php index 2a0138c9576..09ff465971a 100644 --- a/includes/exception/LocalizedException.php +++ b/includes/exception/LocalizedException.php @@ -20,6 +20,7 @@ use MediaWiki\Message\Message; use MediaWiki\Parser\Sanitizer; +use Wikimedia\Message\MessageSpecifier; /** * Basic localized exception. diff --git a/includes/exception/MWExceptionRenderer.php b/includes/exception/MWExceptionRenderer.php index 762cf00b75b..68ef748ee48 100644 --- a/includes/exception/MWExceptionRenderer.php +++ b/includes/exception/MWExceptionRenderer.php @@ -26,6 +26,7 @@ use MediaWiki\MediaWikiServices; use MediaWiki\Message\Message; use MediaWiki\Request\WebRequest; use Wikimedia\AtEase; +use Wikimedia\Message\MessageSpecifier; use Wikimedia\Rdbms\DBConnectionError; use Wikimedia\Rdbms\DBExpectedError; use Wikimedia\Rdbms\DBReadOnlyError; diff --git a/includes/filerepo/ThumbnailEntryPoint.php b/includes/filerepo/ThumbnailEntryPoint.php index 54fb035411f..adcdb51635f 100644 --- a/includes/filerepo/ThumbnailEntryPoint.php +++ b/includes/filerepo/ThumbnailEntryPoint.php @@ -47,10 +47,10 @@ use MediaWiki\Profiler\ProfilingContext; use MediaWiki\Request\HeaderCallback; use MediaWiki\Status\Status; use MediaWiki\Title\Title; -use MessageSpecifier; use RepoGroup; use UnregisteredLocalFile; use Wikimedia\AtEase\AtEase; +use Wikimedia\Message\MessageSpecifier; class ThumbnailEntryPoint extends MediaWikiEntryPoint { diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php index fb74bb6115d..b14fb5cdb4d 100644 --- a/includes/htmlform/HTMLForm.php +++ b/includes/htmlform/HTMLForm.php @@ -77,9 +77,9 @@ use MediaWiki\Status\Status; use MediaWiki\Title\Title; use MediaWiki\Title\TitleValue; use MediaWiki\Xml\Xml; -use MessageSpecifier; use StatusValue; use Stringable; +use Wikimedia\Message\MessageSpecifier; /** * Object handling generic submission, CSRF protection, layout and diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php index 2a6fdff922e..c74ab1ac62a 100644 --- a/includes/htmlform/HTMLFormField.php +++ b/includes/htmlform/HTMLFormField.php @@ -14,8 +14,8 @@ use MediaWiki\Logger\LoggerFactory; use MediaWiki\Message\Message; use MediaWiki\Request\WebRequest; use MediaWiki\Status\Status; -use MessageSpecifier; use StatusValue; +use Wikimedia\Message\MessageSpecifier; /** * The parent class to generate form fields. Any field type should diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php index 59894c86ceb..d662ba10b1b 100644 --- a/includes/installer/CliInstaller.php +++ b/includes/installer/CliInstaller.php @@ -28,7 +28,7 @@ use MediaWiki\Parser\Sanitizer; use MediaWiki\Password\UserPasswordPolicy; use MediaWiki\Status\Status; use MediaWiki\User\User; -use MessageSpecifier; +use Wikimedia\Message\MessageSpecifier; /** * Class for the core installer command line interface. diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index f4923f20238..fc074b78c7f 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -57,11 +57,11 @@ use MediaWiki\Title\Title; use MediaWiki\User\Options\StaticUserOptionsLookup; use MediaWiki\User\User; use MediaWiki\Utils\UrlUtils; -use MessageSpecifier; use MWCryptRand; use ParserOptions; use RuntimeException; use Wikimedia\AtEase\AtEase; +use Wikimedia\Message\MessageSpecifier; use Wikimedia\ObjectCache\EmptyBagOStuff; use Wikimedia\Services\ServiceDisabledException; use WikitextContent; diff --git a/includes/language/MessageLocalizer.php b/includes/language/MessageLocalizer.php index ffac76045f7..f6d914d4ece 100644 --- a/includes/language/MessageLocalizer.php +++ b/includes/language/MessageLocalizer.php @@ -19,6 +19,7 @@ */ use MediaWiki\Message\Message; +use Wikimedia\Message\MessageSpecifier; /** * Interface for localizing messages in MediaWiki diff --git a/includes/libs/MessageSpecifier.php b/includes/libs/Message/MessageSpecifier.php similarity index 91% rename from includes/libs/MessageSpecifier.php rename to includes/libs/Message/MessageSpecifier.php index 97ae475557d..d54673b39c3 100644 --- a/includes/libs/MessageSpecifier.php +++ b/includes/libs/Message/MessageSpecifier.php @@ -18,6 +18,8 @@ * @file */ +namespace Wikimedia\Message; + /** * @stable for implementing */ @@ -40,3 +42,8 @@ interface MessageSpecifier { */ public function getParams(); } + +/** + * @deprecated since 1.43 + */ +class_alias( MessageSpecifier::class, 'MessageSpecifier' ); diff --git a/includes/libs/StatusValue.php b/includes/libs/StatusValue.php index 2ecc2dd3cf5..f5013571eec 100644 --- a/includes/libs/StatusValue.php +++ b/includes/libs/StatusValue.php @@ -21,6 +21,7 @@ use MediaWiki\Message\Converter; use MediaWiki\Message\Message; use Wikimedia\Assert\Assert; +use Wikimedia\Message\MessageSpecifier; use Wikimedia\Message\MessageValue; /** diff --git a/includes/libs/rdbms/exception/DBExpectedError.php b/includes/libs/rdbms/exception/DBExpectedError.php index 790c032491a..b3ddfe2e88a 100644 --- a/includes/libs/rdbms/exception/DBExpectedError.php +++ b/includes/libs/rdbms/exception/DBExpectedError.php @@ -19,7 +19,7 @@ */ namespace Wikimedia\Rdbms; -use MessageSpecifier; +use Wikimedia\Message\MessageSpecifier; /** * Base class for the more common types of database errors. These are known to occur diff --git a/includes/mail/EmailUser.php b/includes/mail/EmailUser.php index 5435cfd80e5..bf7dcb9a3e8 100644 --- a/includes/mail/EmailUser.php +++ b/includes/mail/EmailUser.php @@ -32,11 +32,11 @@ use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\User\CentralId\CentralIdLookup; use MediaWiki\User\Options\UserOptionsLookup; use MediaWiki\User\UserFactory; -use MessageSpecifier; use StatusValue; use UnexpectedValueException; use Wikimedia\Message\IMessageFormatterFactory; use Wikimedia\Message\ITextFormatter; +use Wikimedia\Message\MessageSpecifier; use Wikimedia\Message\MessageValue; /** diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php index 030f2be2b70..97c73ad388b 100644 --- a/includes/skins/SkinTemplate.php +++ b/includes/skins/SkinTemplate.php @@ -32,6 +32,7 @@ use MediaWiki\Skin\SkinComponentUtils; use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\Specials\Contribute\ContributeFactory; use MediaWiki\Title\Title; +use Wikimedia\Message\MessageSpecifier; /** * Base class for QuickTemplate-based skins. diff --git a/includes/specialpage/SpecialPage.php b/includes/specialpage/SpecialPage.php index ef4bc569e49..5f0364ef826 100644 --- a/includes/specialpage/SpecialPage.php +++ b/includes/specialpage/SpecialPage.php @@ -45,13 +45,13 @@ use MediaWiki\Title\Title; use MediaWiki\Title\TitleValue; use MediaWiki\User\User; use MessageLocalizer; -use MessageSpecifier; use MWCryptRand; use PermissionsError; use ReadOnlyError; use SearchEngineFactory; use Skin; use UserNotLoggedIn; +use Wikimedia\Message\MessageSpecifier; /** * Parent class for all special pages. diff --git a/includes/specials/Hook/EmailUserHook.php b/includes/specials/Hook/EmailUserHook.php index f919d104451..90af7be1d48 100644 --- a/includes/specials/Hook/EmailUserHook.php +++ b/includes/specials/Hook/EmailUserHook.php @@ -4,7 +4,7 @@ namespace MediaWiki\Hook; use MailAddress; use MediaWiki\Status\Status; -use MessageSpecifier; +use Wikimedia\Message\MessageSpecifier; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php index 11e3f49cf7e..4e55acbc978 100644 --- a/includes/specials/SpecialBlock.php +++ b/includes/specials/SpecialBlock.php @@ -55,12 +55,12 @@ use MediaWiki\User\User; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserNamePrefixSearch; use MediaWiki\User\UserNameUtils; -use MessageSpecifier; use OOUI\FieldLayout; use OOUI\HtmlSnippet; use OOUI\LabelWidget; use OOUI\Widget; use Wikimedia\IPUtils; +use Wikimedia\Message\MessageSpecifier; /** * Allow users with 'block' user right to block IPs and user accounts from diff --git a/includes/upload/Hook/UploadStashFileHook.php b/includes/upload/Hook/UploadStashFileHook.php index da9f5cba332..6a957c26215 100644 --- a/includes/upload/Hook/UploadStashFileHook.php +++ b/includes/upload/Hook/UploadStashFileHook.php @@ -3,8 +3,8 @@ namespace MediaWiki\Hook; use MediaWiki\User\User; -use MessageSpecifier; use UploadBase; +use Wikimedia\Message\MessageSpecifier; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/upload/Hook/UploadVerifyFileHook.php b/includes/upload/Hook/UploadVerifyFileHook.php index 13379746e35..ccc9d6506c5 100644 --- a/includes/upload/Hook/UploadVerifyFileHook.php +++ b/includes/upload/Hook/UploadVerifyFileHook.php @@ -2,8 +2,8 @@ namespace MediaWiki\Hook; -use MessageSpecifier; use UploadBase; +use Wikimedia\Message\MessageSpecifier; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/upload/Hook/UploadVerifyUploadHook.php b/includes/upload/Hook/UploadVerifyUploadHook.php index 3075434aa78..fff4f54a1fd 100644 --- a/includes/upload/Hook/UploadVerifyUploadHook.php +++ b/includes/upload/Hook/UploadVerifyUploadHook.php @@ -3,8 +3,8 @@ namespace MediaWiki\Hook; use MediaWiki\User\User; -use MessageSpecifier; use UploadBase; +use Wikimedia\Message\MessageSpecifier; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/upload/exception/UploadStashException.php b/includes/upload/exception/UploadStashException.php index 3069cae8784..b905d57bddf 100644 --- a/includes/upload/exception/UploadStashException.php +++ b/includes/upload/exception/UploadStashException.php @@ -20,6 +20,7 @@ use MediaWiki\Message\Message; use MediaWiki\Parser\Sanitizer; +use Wikimedia\Message\MessageSpecifier; /** * @newable diff --git a/includes/user/Hook/IsValidPasswordHook.php b/includes/user/Hook/IsValidPasswordHook.php index 73dbedf05c6..a6f8c5bb665 100644 --- a/includes/user/Hook/IsValidPasswordHook.php +++ b/includes/user/Hook/IsValidPasswordHook.php @@ -3,7 +3,7 @@ namespace MediaWiki\User\Hook; use MediaWiki\User\User; -use MessageSpecifier; +use Wikimedia\Message\MessageSpecifier; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/user/Hook/SpecialPasswordResetOnSubmitHook.php b/includes/user/Hook/SpecialPasswordResetOnSubmitHook.php index 89b00c81589..145b1098415 100644 --- a/includes/user/Hook/SpecialPasswordResetOnSubmitHook.php +++ b/includes/user/Hook/SpecialPasswordResetOnSubmitHook.php @@ -3,7 +3,7 @@ namespace MediaWiki\User\Hook; use MediaWiki\User\User; -use MessageSpecifier; +use Wikimedia\Message\MessageSpecifier; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/tests/phpunit/includes/Status/StatusTest.php b/tests/phpunit/includes/Status/StatusTest.php index 2de593f937e..5796b471490 100644 --- a/tests/phpunit/includes/Status/StatusTest.php +++ b/tests/phpunit/includes/Status/StatusTest.php @@ -5,6 +5,7 @@ use MediaWiki\Context\RequestContext; use MediaWiki\Language\RawMessage; use MediaWiki\Message\Message; use MediaWiki\Status\Status; +use Wikimedia\Message\MessageSpecifier; use Wikimedia\Message\MessageValue; /** diff --git a/tests/phpunit/includes/api/ApiBaseTest.php b/tests/phpunit/includes/api/ApiBaseTest.php index 050c19e5bf2..0510af3c8f5 100644 --- a/tests/phpunit/includes/api/ApiBaseTest.php +++ b/tests/phpunit/includes/api/ApiBaseTest.php @@ -20,9 +20,9 @@ use MediaWiki\Permissions\PermissionStatus; use MediaWiki\Request\FauxRequest; use MediaWiki\Status\Status; use MediaWiki\Title\Title; -use MessageSpecifier; use MWException; use StatusValue; +use Wikimedia\Message\MessageSpecifier; use Wikimedia\ParamValidator\ParamValidator; use Wikimedia\ParamValidator\TypeDef\EnumDef; use Wikimedia\ParamValidator\TypeDef\IntegerDef; diff --git a/tests/phpunit/includes/auth/AuthManagerTest.php b/tests/phpunit/includes/auth/AuthManagerTest.php index d0a02d7a131..1db85ac0ff5 100644 --- a/tests/phpunit/includes/auth/AuthManagerTest.php +++ b/tests/phpunit/includes/auth/AuthManagerTest.php @@ -59,7 +59,6 @@ use MediaWiki\User\UserIdentityLookup; use MediaWiki\User\UserNameUtils; use MediaWiki\Watchlist\WatchlistManager; use MediaWikiIntegrationTestCase; -use MessageSpecifier; use ObjectCacheFactory; use PHPUnit\Framework\Assert; use PHPUnit\Framework\MockObject\Builder\InvocationMocker; @@ -74,6 +73,7 @@ use StatusValue; use TestLogger; use TestUser; use UnexpectedValueException; +use Wikimedia\Message\MessageSpecifier; use Wikimedia\ObjectCache\HashBagOStuff; use Wikimedia\ObjectFactory\ObjectFactory; use Wikimedia\Rdbms\ILoadBalancer; diff --git a/tests/phpunit/includes/language/MessageTest.php b/tests/phpunit/includes/language/MessageTest.php index 706fa050903..db1523642c9 100644 --- a/tests/phpunit/includes/language/MessageTest.php +++ b/tests/phpunit/includes/language/MessageTest.php @@ -10,6 +10,7 @@ use MediaWiki\Page\PageReferenceValue; use MediaWiki\User\UserIdentityValue; use Wikimedia\Assert\ParameterTypeException; use Wikimedia\Bcp47Code\Bcp47CodeValue; +use Wikimedia\Message\MessageSpecifier; use Wikimedia\TestingAccessWrapper; /** diff --git a/tests/phpunit/mocks/MockMessageLocalizer.php b/tests/phpunit/mocks/MockMessageLocalizer.php index 69aaf502d1d..2601eb5c89d 100644 --- a/tests/phpunit/mocks/MockMessageLocalizer.php +++ b/tests/phpunit/mocks/MockMessageLocalizer.php @@ -1,6 +1,7 @@