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

@@ -385,6 +385,8 @@ because of Phabricator reports.
     - FileBackend
   - Wikimedia\Http:
     - MultiHttpClient
+  - Wikimedia\Message:
+    - MessageSpecifier
   - Wikimedia\ObjectCache:
     - APCUBagOStuff
     - BagOStuff

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

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;
 

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;

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

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;

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.

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.

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;
 
 /**

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

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.

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

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;

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

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;

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

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;
 

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

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
  *

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;
 

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;
 
 /**

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;

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.

includes/exception/LocalizedException.php

@@ -20,6 +20,7 @@
 
 use MediaWiki\Message\Message;
 use MediaWiki\Parser\Sanitizer;
+use Wikimedia\Message\MessageSpecifier;
 
 /**
  * Basic localized exception.

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;

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 {
 

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

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

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.

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;

includes/language/MessageLocalizer.php

@@ -19,6 +19,7 @@
  */
 
 use MediaWiki\Message\Message;
+use Wikimedia\Message\MessageSpecifier;
 
 /**
  * Interface for localizing messages in MediaWiki

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

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;
 
 /**

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

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;
 
 /**

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.

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.

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.

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

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.

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.

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.

includes/upload/exception/UploadStashException.php

@@ -20,6 +20,7 @@
 
 use MediaWiki\Message\Message;
 use MediaWiki\Parser\Sanitizer;
+use Wikimedia\Message\MessageSpecifier;
 
 /**
  * @newable

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.

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.

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;
 
 /**

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;

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;

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;
 
 /**

tests/phpunit/mocks/MockMessageLocalizer.php

@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Message\Message;
+use Wikimedia\Message\MessageSpecifier;
 
 /**
  * A simple {@link MessageLocalizer} implementation for use in tests.