diff --git a/autoload.php b/autoload.php index 02a1f3dfdc4..e0e1ba3f842 100644 --- a/autoload.php +++ b/autoload.php @@ -1431,6 +1431,7 @@ $wgAutoloadLocalClasses = [ 'MediaWiki\\Json\\JsonUnserializable' => __DIR__ . '/includes/json/JsonUnserializable.php', 'MediaWiki\\Json\\JsonUnserializableTrait' => __DIR__ . '/includes/json/JsonUnserializableTrait.php', 'MediaWiki\\Json\\JsonUnserializer' => __DIR__ . '/includes/json/JsonUnserializer.php', + 'MediaWiki\\Language\\RawMessage' => __DIR__ . '/includes/language/RawMessage.php', 'MediaWiki\\Languages\\Data\\CrhExceptions' => __DIR__ . '/includes/languages/data/CrhExceptions.php', 'MediaWiki\\Languages\\Data\\Names' => __DIR__ . '/includes/languages/data/Names.php', 'MediaWiki\\Languages\\Data\\NormalizeAr' => __DIR__ . '/includes/languages/data/NormalizeAr.php', @@ -2206,7 +2207,7 @@ $wgAutoloadLocalClasses = [ 'RangeChronologicalPager' => __DIR__ . '/includes/pager/RangeChronologicalPager.php', 'RangeDifference' => __DIR__ . '/includes/diff/RangeDifference.php', 'RawAction' => __DIR__ . '/includes/actions/RawAction.php', - 'RawMessage' => __DIR__ . '/includes/RawMessage.php', + 'RawMessage' => __DIR__ . '/includes/language/RawMessage.php', 'ReadOnlyError' => __DIR__ . '/includes/exception/ReadOnlyError.php', 'ReadOnlyMode' => __DIR__ . '/includes/ReadOnlyMode.php', 'ReassignEdits' => __DIR__ . '/maintenance/reassignEdits.php', diff --git a/includes/CommentStore.php b/includes/CommentStore.php index a16e0610e86..51ff7791118 100644 --- a/includes/CommentStore.php +++ b/includes/CommentStore.php @@ -18,6 +18,7 @@ * @file */ +use MediaWiki\Language\RawMessage; use MediaWiki\MediaWikiServices; use Wikimedia\Rdbms\IDatabase; diff --git a/includes/CommentStoreComment.php b/includes/CommentStoreComment.php index f414a0026af..cce94b0e2ed 100644 --- a/includes/CommentStoreComment.php +++ b/includes/CommentStoreComment.php @@ -17,6 +17,8 @@ * * @file */ + +use MediaWiki\Language\RawMessage; use MediaWiki\MediaWikiServices; /** diff --git a/includes/EditPage.php b/includes/EditPage.php index ff1f680e782..9eca31fc768 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -47,6 +47,7 @@ use MediaWiki\EditPage\IEditObject; use MediaWiki\EditPage\TextboxBuilder; use MediaWiki\EditPage\TextConflictHelper; use MediaWiki\HookContainer\ProtectedHookAccessorTrait; +use MediaWiki\Language\RawMessage; use MediaWiki\Linker\Linker; use MediaWiki\Linker\LinkRenderer; use MediaWiki\Logger\LoggerFactory; diff --git a/includes/MWTimestamp.php b/includes/MWTimestamp.php index 5e5ea4dc296..2070560d200 100644 --- a/includes/MWTimestamp.php +++ b/includes/MWTimestamp.php @@ -22,6 +22,7 @@ * @author Tyler Romeo, 2012 */ +use MediaWiki\Language\RawMessage; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\User\UserIdentity; diff --git a/includes/Navigation/PagerNavigationBuilder.php b/includes/Navigation/PagerNavigationBuilder.php index 9f2011bd0ef..4432ac23bae 100644 --- a/includes/Navigation/PagerNavigationBuilder.php +++ b/includes/Navigation/PagerNavigationBuilder.php @@ -3,10 +3,10 @@ namespace MediaWiki\Navigation; use Html; +use MediaWiki\Language\RawMessage; use MediaWiki\Page\PageReference; use Message; use MessageLocalizer; -use RawMessage; use RuntimeException; use Title; diff --git a/includes/Status.php b/includes/Status.php index 8291ca2e2c5..933d93ba53d 100644 --- a/includes/Status.php +++ b/includes/Status.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\Language\RawMessage; use MediaWiki\MediaWikiServices; use MediaWiki\StubObject\StubUserLang; diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php index 1b094dbe37a..3b182682411 100644 --- a/includes/api/ApiBase.php +++ b/includes/api/ApiBase.php @@ -24,6 +24,7 @@ use MediaWiki\Api\ApiHookRunner; use MediaWiki\Api\Validator\SubmoduleDef; use MediaWiki\Block\Block; use MediaWiki\HookContainer\HookContainer; +use MediaWiki\Language\RawMessage; use MediaWiki\Linker\LinkTarget; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; diff --git a/includes/api/ApiErrorFormatter.php b/includes/api/ApiErrorFormatter.php index ccafd5912b3..ce7fad7a75e 100644 --- a/includes/api/ApiErrorFormatter.php +++ b/includes/api/ApiErrorFormatter.php @@ -21,6 +21,7 @@ * @file */ +use MediaWiki\Language\RawMessage; use MediaWiki\Page\PageReference; use MediaWiki\Page\PageReferenceValue; diff --git a/includes/api/ApiMessage.php b/includes/api/ApiMessage.php index e2e257b3961..4edc047755c 100644 --- a/includes/api/ApiMessage.php +++ b/includes/api/ApiMessage.php @@ -18,6 +18,8 @@ * @file */ +use MediaWiki\Language\RawMessage; + /** * Extension of Message implementing IApiMessage * @newable diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php index e7ab3c6eedd..93c252ace67 100644 --- a/includes/api/ApiParse.php +++ b/includes/api/ApiParse.php @@ -25,6 +25,7 @@ use MediaWiki\CommentFormatter\CommentFormatter; use MediaWiki\Content\IContentHandlerFactory; use MediaWiki\Content\Renderer\ContentRenderer; use MediaWiki\Content\Transform\ContentTransformer; +use MediaWiki\Language\RawMessage; use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\Page\PageReference; use MediaWiki\Page\WikiPageFactory; diff --git a/includes/api/ApiRawMessage.php b/includes/api/ApiRawMessage.php index e7a46307129..2147c4e387e 100644 --- a/includes/api/ApiRawMessage.php +++ b/includes/api/ApiRawMessage.php @@ -18,6 +18,8 @@ * @file */ +use MediaWiki\Language\RawMessage; + /** * Extension of RawMessage implementing IApiMessage * @newable diff --git a/includes/auth/AuthenticationRequest.php b/includes/auth/AuthenticationRequest.php index f138cd0dbf7..57f527d5b81 100644 --- a/includes/auth/AuthenticationRequest.php +++ b/includes/auth/AuthenticationRequest.php @@ -235,8 +235,8 @@ abstract class AuthenticationRequest { */ public function describeCredentials() { return [ - 'provider' => new \RawMessage( '$1', [ get_called_class() ] ), - 'account' => new \RawMessage( '$1', [ $this->getUniqueId() ] ), + 'provider' => new \MediaWiki\Language\RawMessage( '$1', [ get_called_class() ] ), + 'account' => new \MediaWiki\Language\RawMessage( '$1', [ $this->getUniqueId() ] ), ]; } diff --git a/includes/auth/ButtonAuthenticationRequest.php b/includes/auth/ButtonAuthenticationRequest.php index d82cb962c8f..880c1228de3 100644 --- a/includes/auth/ButtonAuthenticationRequest.php +++ b/includes/auth/ButtonAuthenticationRequest.php @@ -21,8 +21,8 @@ namespace MediaWiki\Auth; +use MediaWiki\Language\RawMessage; use Message; -use RawMessage; /** * This is an authentication request that just implements a simple button. diff --git a/includes/auth/PasswordAuthenticationRequest.php b/includes/auth/PasswordAuthenticationRequest.php index 89280400dbe..f8c3573102e 100644 --- a/includes/auth/PasswordAuthenticationRequest.php +++ b/includes/auth/PasswordAuthenticationRequest.php @@ -88,7 +88,7 @@ class PasswordAuthenticationRequest extends AuthenticationRequest { public function describeCredentials() { return [ 'provider' => wfMessage( 'authmanager-provider-password' ), - 'account' => new \RawMessage( '$1', [ $this->username ] ), + 'account' => new \MediaWiki\Language\RawMessage( '$1', [ $this->username ] ), ]; } } diff --git a/includes/auth/PasswordDomainAuthenticationRequest.php b/includes/auth/PasswordDomainAuthenticationRequest.php index bf1c989f5bb..9886efe28eb 100644 --- a/includes/auth/PasswordDomainAuthenticationRequest.php +++ b/includes/auth/PasswordDomainAuthenticationRequest.php @@ -58,7 +58,7 @@ class PasswordDomainAuthenticationRequest extends PasswordAuthenticationRequest 'help' => wfMessage( 'authmanager-domain-help' ), ]; foreach ( $this->domainList as $domain ) { - $ret['domain']['options'][$domain] = new \RawMessage( '$1', [ $domain ] ); + $ret['domain']['options'][$domain] = new \MediaWiki\Language\RawMessage( '$1', [ $domain ] ); } } diff --git a/includes/auth/TemporaryPasswordAuthenticationRequest.php b/includes/auth/TemporaryPasswordAuthenticationRequest.php index bca8c8aca6a..a8bfd9cd6d9 100644 --- a/includes/auth/TemporaryPasswordAuthenticationRequest.php +++ b/includes/auth/TemporaryPasswordAuthenticationRequest.php @@ -102,7 +102,7 @@ class TemporaryPasswordAuthenticationRequest extends AuthenticationRequest { public function describeCredentials() { return [ 'provider' => wfMessage( 'authmanager-provider-temporarypassword' ), - 'account' => new \RawMessage( '$1', [ $this->username ] ), + 'account' => new \MediaWiki\Language\RawMessage( '$1', [ $this->username ] ), ] + parent::describeCredentials(); } diff --git a/includes/changetags/ChangeTags.php b/includes/changetags/ChangeTags.php index cac2d75b22c..2817af004d8 100644 --- a/includes/changetags/ChangeTags.php +++ b/includes/changetags/ChangeTags.php @@ -22,6 +22,7 @@ */ use MediaWiki\HookContainer\HookRunner; +use MediaWiki\Language\RawMessage; use MediaWiki\Linker\Linker; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; diff --git a/includes/language/Message.php b/includes/language/Message.php index 8f48e84f4c0..e70cf5ec054 100644 --- a/includes/language/Message.php +++ b/includes/language/Message.php @@ -19,6 +19,7 @@ * @author Niklas Laxström */ +use MediaWiki\Language\RawMessage; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; diff --git a/includes/RawMessage.php b/includes/language/RawMessage.php similarity index 94% rename from includes/RawMessage.php rename to includes/language/RawMessage.php index fa9f13cd7c5..130c1ac30e1 100644 --- a/includes/RawMessage.php +++ b/includes/language/RawMessage.php @@ -18,6 +18,11 @@ * @file */ +namespace MediaWiki\Language; + +use InvalidArgumentException; +use Message; + /** * Variant of the Message class. * @@ -72,3 +77,5 @@ class RawMessage extends Message { } } + +class_alias( RawMessage::class, 'RawMessage' ); diff --git a/includes/page/DeletePage.php b/includes/page/DeletePage.php index 5e95629f64f..457ae314a5d 100644 --- a/includes/page/DeletePage.php +++ b/includes/page/DeletePage.php @@ -20,6 +20,7 @@ use MediaWiki\Deferred\LinksUpdate\LinksDeletionUpdate; use MediaWiki\Deferred\LinksUpdate\LinksUpdate; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; +use MediaWiki\Language\RawMessage; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; use MediaWiki\Permissions\Authority; @@ -31,7 +32,6 @@ use MediaWiki\Revision\SlotRecord; use MediaWiki\User\UserFactory; use Message; use NamespaceInfo; -use RawMessage; use SearchUpdate; use SiteStatsUpdate; use Status; diff --git a/includes/page/RollbackPage.php b/includes/page/RollbackPage.php index 432cb316752..fa11d3f3772 100644 --- a/includes/page/RollbackPage.php +++ b/includes/page/RollbackPage.php @@ -26,6 +26,7 @@ use ManualLogEntry; use MediaWiki\Config\ServiceOptions; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; +use MediaWiki\Language\RawMessage; use MediaWiki\MainConfigNames; use MediaWiki\Message\Converter; use MediaWiki\Permissions\Authority; @@ -38,7 +39,6 @@ use MediaWiki\User\ActorNormalization; use MediaWiki\User\UserFactory; use MediaWiki\User\UserIdentity; use Message; -use RawMessage; use ReadOnlyMode; use RecentChange; use StatusValue; diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index 78749760231..43dd652a9bd 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -27,6 +27,7 @@ use MediaWiki\Config\ServiceOptions; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Http\HttpRequestFactory; +use MediaWiki\Language\RawMessage; use MediaWiki\Languages\LanguageConverterFactory; use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\Linker\Linker; diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php index 5f965b5ee69..0afaade5258 100644 --- a/includes/parser/ParserOutput.php +++ b/includes/parser/ParserOutput.php @@ -3,6 +3,7 @@ use MediaWiki\Json\JsonUnserializable; use MediaWiki\Json\JsonUnserializableTrait; use MediaWiki\Json\JsonUnserializer; +use MediaWiki\Language\RawMessage; use MediaWiki\Linker\Linker; use MediaWiki\Linker\LinkTarget; use MediaWiki\Logger\LoggerFactory; diff --git a/includes/specialpage/AuthManagerSpecialPage.php b/includes/specialpage/AuthManagerSpecialPage.php index c9a5cfa90a5..bb4af073e40 100644 --- a/includes/specialpage/AuthManagerSpecialPage.php +++ b/includes/specialpage/AuthManagerSpecialPage.php @@ -3,6 +3,7 @@ use MediaWiki\Auth\AuthenticationRequest; use MediaWiki\Auth\AuthenticationResponse; use MediaWiki\Auth\AuthManager; +use MediaWiki\Language\RawMessage; use MediaWiki\Logger\LoggerFactory; use MediaWiki\Request\DerivativeRequest; use MediaWiki\Session\Token; diff --git a/includes/specials/SpecialChangeContentModel.php b/includes/specials/SpecialChangeContentModel.php index 5fdb1110c13..77f32f801e5 100644 --- a/includes/specials/SpecialChangeContentModel.php +++ b/includes/specials/SpecialChangeContentModel.php @@ -2,6 +2,7 @@ use MediaWiki\Content\IContentHandlerFactory; use MediaWiki\EditPage\SpamChecker; +use MediaWiki\Language\RawMessage; use MediaWiki\Page\ContentModelChangeFactory; use MediaWiki\Page\WikiPageFactory; use MediaWiki\Revision\RevisionLookup; diff --git a/includes/specials/SpecialConfirmEmail.php b/includes/specials/SpecialConfirmEmail.php index a8b24b18ada..218ab2736b6 100644 --- a/includes/specials/SpecialConfirmEmail.php +++ b/includes/specials/SpecialConfirmEmail.php @@ -21,6 +21,7 @@ * @ingroup SpecialPage */ +use MediaWiki\Language\RawMessage; use MediaWiki\User\UserFactory; use Wikimedia\ScopedCallback; diff --git a/includes/specials/SpecialPageLanguage.php b/includes/specials/SpecialPageLanguage.php index 9d5da9e885f..2ccefb98144 100644 --- a/includes/specials/SpecialPageLanguage.php +++ b/includes/specials/SpecialPageLanguage.php @@ -24,6 +24,7 @@ */ use MediaWiki\Content\IContentHandlerFactory; +use MediaWiki\Language\RawMessage; use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\MainConfigNames; use MediaWiki\Permissions\PermissionStatus; diff --git a/maintenance/edit.php b/maintenance/edit.php index a36cdf31d96..6e30bbabdf8 100644 --- a/maintenance/edit.php +++ b/maintenance/edit.php @@ -21,6 +21,7 @@ * @ingroup Maintenance */ +use MediaWiki\Language\RawMessage; use MediaWiki\MediaWikiServices; use MediaWiki\Revision\SlotRecord; use MediaWiki\StubObject\StubGlobalUser; diff --git a/tests/phpunit/includes/CommentStoreTest.php b/tests/phpunit/includes/CommentStoreTest.php index 619d03e2cb1..54ddb797ca5 100644 --- a/tests/phpunit/includes/CommentStoreTest.php +++ b/tests/phpunit/includes/CommentStoreTest.php @@ -1,5 +1,6 @@