Reorg: Move RawMessage to under language/

To follow Message. This is approved as part of RFC T166010.

Also namespace it but doing it properly with PSR-4 would require
namespacing every class under language/ and that will take some time.

Bug: T321882
Change-Id: I195cf4c67bd51410556c2dd1e33cc9c1033d5d18

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',

includes/CommentStore.php

@@ -18,6 +18,7 @@
  * @file
  */
 
+use MediaWiki\Language\RawMessage;
 use MediaWiki\MediaWikiServices;
 use Wikimedia\Rdbms\IDatabase;
 

includes/CommentStoreComment.php

@@ -17,6 +17,8 @@
  *
  * @file
  */
+
+use MediaWiki\Language\RawMessage;
 use MediaWiki\MediaWikiServices;
 
 /**

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;

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;

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;
 

includes/Status.php

@@ -20,6 +20,7 @@
  * @file
  */
 
+use MediaWiki\Language\RawMessage;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\StubObject\StubUserLang;
 

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;

includes/api/ApiErrorFormatter.php

@@ -21,6 +21,7 @@
  * @file
  */
 
+use MediaWiki\Language\RawMessage;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageReferenceValue;
 

includes/api/ApiMessage.php

@@ -18,6 +18,8 @@
  * @file
  */
 
+use MediaWiki\Language\RawMessage;
+
 /**
  * Extension of Message implementing IApiMessage
  * @newable

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;

includes/api/ApiRawMessage.php

@@ -18,6 +18,8 @@
  * @file
  */
 
+use MediaWiki\Language\RawMessage;
+
 /**
  * Extension of RawMessage implementing IApiMessage
  * @newable

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() ] ),
 		];
 	}
 

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.

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 ] ),
 		];
 	}
 }

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 ] );
 			}
 		}
 

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();
 	}
 

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;

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;

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' );

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;

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;

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;

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;

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;

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;

includes/specials/SpecialConfirmEmail.php

@@ -21,6 +21,7 @@
  * @ingroup SpecialPage
  */
 
+use MediaWiki\Language\RawMessage;
 use MediaWiki\User\UserFactory;
 use Wikimedia\ScopedCallback;
 

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;

maintenance/edit.php

@@ -21,6 +21,7 @@
  * @ingroup Maintenance
  */
 
+use MediaWiki\Language\RawMessage;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\StubObject\StubGlobalUser;

tests/phpunit/includes/CommentStoreTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Language\RawMessage;
 use Wikimedia\Rdbms\IMaintainableDatabase;
 
 /**

tests/phpunit/includes/MessageTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Language\RawMessage;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Message\UserGroupMembershipParam;

tests/phpunit/includes/StatusTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Language\RawMessage;
 use Wikimedia\Message\MessageValue;
 use Wikimedia\TestingAccessWrapper;
 

tests/phpunit/includes/TitleTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Cache\CacheKeyHelper;
+use MediaWiki\Language\RawMessage;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageIdentity;

tests/phpunit/includes/actions/WatchActionTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Language\RawMessage;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;

tests/phpunit/includes/api/ApiErrorFormatterTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Language\RawMessage;
 use Wikimedia\TestingAccessWrapper;
 
 /**

tests/phpunit/includes/api/ApiMainTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Language\RawMessage;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Request\FauxRequest;

tests/phpunit/includes/api/ApiMessageTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Language\RawMessage;
 use MediaWiki\Page\PageReferenceValue;
 use Wikimedia\TestingAccessWrapper;
 

tests/phpunit/includes/changetags/ChangeTagsTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Language\RawMessage;
 use MediaWiki\MainConfigNames;
 
 /**

tests/phpunit/includes/content/MessageContentTest.php

@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Language\RawMessage;
+
 /**
  * @group ContentHandler
  * @covers MessageContent

tests/phpunit/includes/htmlform/HTMLFormTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Language\RawMessage;
 use MediaWiki\Request\FauxRequest;
 
 /**

tests/phpunit/includes/parser/CoreParserFunctionsTest.php

@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Language\RawMessage;
+
 /**
  * @group Database
  * @covers CoreParserFunctions

tests/phpunit/includes/parser/ParserMethodsTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Language\RawMessage;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Revision\MutableRevisionRecord;

tests/phpunit/includes/specials/SpecialUncategorizedCategoriesTest.php

@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Language\RawMessage;
+
 /**
  * Tests for Special:UncategorizedCategories
  */