Reorg: Move Status to MediaWiki\Status\

This class is used heavily basically everywhere, moving it to Utils
wouldn't make much sense. Also with this change, we can move
StatusValue to MediaWiki\Status as well.

Bug: T321882
Depends-On: I5f89ecf27ce1471a74f31c6018806461781213c3
Change-Id: I04c1dcf5129df437589149f0f3e284974d7c98fa

autoload.php

@@ -2049,6 +2049,7 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Specials\\SpecialUserRights' => __DIR__ . '/includes/specials/SpecialUserRights.php',
 	'MediaWiki\\Specials\\SpecialWantedFiles' => __DIR__ . '/includes/specials/SpecialWantedFiles.php',
 	'MediaWiki\\Specials\\SpecialWantedPages' => __DIR__ . '/includes/specials/SpecialWantedPages.php',
+	'MediaWiki\\Status\\Status' => __DIR__ . '/includes/Status/Status.php',
 	'MediaWiki\\Storage\\BadBlobException' => __DIR__ . '/includes/Storage/BadBlobException.php',
 	'MediaWiki\\Storage\\BlobAccessException' => __DIR__ . '/includes/Storage/BlobAccessException.php',
 	'MediaWiki\\Storage\\BlobStore' => __DIR__ . '/includes/Storage/BlobStore.php',
@@ -2692,7 +2693,7 @@ $wgAutoloadLocalClasses = [
 	'SrConverter' => __DIR__ . '/includes/language/converters/SrConverter.php',
 	'StatsOutput' => __DIR__ . '/maintenance/language/StatOutputs.php',
 	'StatsdAwareInterface' => __DIR__ . '/includes/libs/Stats/StatsdAwareInterface.php',
-	'Status' => __DIR__ . '/includes/Status.php',
+	'Status' => __DIR__ . '/includes/Status/Status.php',
 	'StatusValue' => __DIR__ . '/includes/libs/StatusValue.php',
 	'StorageTypeStats' => __DIR__ . '/maintenance/storage/storageTypeStats.php',
 	'StoreFileOp' => __DIR__ . '/includes/libs/filebackend/fileop/StoreFileOp.php',

includes/Hook/EditFilterMergedContentHook.php

@@ -4,7 +4,7 @@ namespace MediaWiki\Hook;
 
 use Content;
 use IContextSource;
-use Status;
+use MediaWiki\Status\Status;
 use User;
 
 /**

includes/Hook/EditPage__attemptSave_afterHook.php

@@ -4,7 +4,7 @@ namespace MediaWiki\Hook;
 
 // phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps
 use MediaWiki\EditPage\EditPage;
-use Status;
+use MediaWiki\Status\Status;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/Hook/MovePageCheckPermissionsHook.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Hook;
 
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
-use Status;
 use User;
 
 /**

includes/Hook/MovePageIsValidMoveHook.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Hook;
 
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
-use Status;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/Hook/TitleMoveHook.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Hook;
 
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
-use Status;
 use User;
 
 /**

includes/Rest/Handler/Helper/HtmlInputTransformHelper.php

@@ -38,10 +38,10 @@ use MediaWiki\Rest\LocalizedHttpException;
 use MediaWiki\Rest\ResponseInterface;
 use MediaWiki\Revision\RevisionAccessException;
 use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\Status\Status;
 use MWUnknownContentModelException;
 use ParserOptions;
 use ParserOutput;
-use Status;
 use Wikimedia\Bcp47Code\Bcp47Code;
 use Wikimedia\Message\MessageValue;
 use Wikimedia\ParamValidator\ParamValidator;

includes/Rest/Handler/Helper/HtmlOutputRendererHelper.php

@@ -43,11 +43,11 @@ use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RevisionAccessException;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MWUnknownContentModelException;
 use ParserOptions;
 use ParserOutput;
-use Status;
 use User;
 use Wikimedia\Assert\Assert;
 use Wikimedia\Bcp47Code\Bcp47Code;

includes/Rest/Handler/SearchHandler.php

@@ -16,12 +16,12 @@ use MediaWiki\Rest\LocalizedHttpException;
 use MediaWiki\Rest\Response;
 use MediaWiki\Search\Entity\SearchResultThumbnail;
 use MediaWiki\Search\SearchResultThumbnailProvider;
+use MediaWiki\Status\Status;
 use SearchEngine;
 use SearchEngineConfig;
 use SearchEngineFactory;
 use SearchResult;
 use SearchSuggestion;
-use Status;
 use TitleFormatter;
 use Wikimedia\Message\MessageValue;
 use Wikimedia\ParamValidator\ParamValidator;

includes/Status/Status.php

@@ -20,9 +20,21 @@
  * @file
  */
 
+namespace MediaWiki\Status;
+
+use ApiMessage;
+use ApiRawMessage;
+use Language;
 use MediaWiki\Language\RawMessage;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\StubObject\StubUserLang;
+use Message;
+use MessageLocalizer;
+use MessageSpecifier;
+use ParserOutput;
+use RuntimeException;
+use StatusValue;
+use UnexpectedValueException;
 
 /**
  * Generic operation result class
@@ -149,8 +161,7 @@ class Status extends StatusValue {
 			$errorsOnlyStatus->setMessageLocalizer( $this->messageLocalizer );
 			$warningsOnlyStatus->setMessageLocalizer( $this->messageLocalizer );
 		}
-		$errorsOnlyStatus->cleanCallback =
-			$warningsOnlyStatus->cleanCallback = $this->cleanCallback;
+		$errorsOnlyStatus->cleanCallback = $warningsOnlyStatus->cleanCallback = $this->cleanCallback;
 
 		return [ $errorsOnlyStatus, $warningsOnlyStatus ];
 	}
@@ -192,11 +203,15 @@ class Status extends StatusValue {
 		$rawErrors = $this->getErrors();
 		if ( count( $rawErrors ) === 0 ) {
 			if ( $this->isOK() ) {
-				$this->fatal( 'internalerror_info',
-					__METHOD__ . " called for a good result, this is incorrect\n" );
+				$this->fatal(
+					'internalerror_info',
+					__METHOD__ . " called for a good result, this is incorrect\n"
+				);
 			} else {
-				$this->fatal( 'internalerror_info',
-					__METHOD__ . ": Invalid result object: no error text but not OK\n" );
+				$this->fatal(
+					'internalerror_info',
+					__METHOD__ . ": Invalid result object: no error text but not OK\n"
+				);
 			}
 			$rawErrors = $this->getErrors(); // just added a fatal
 		}
@@ -246,11 +261,15 @@ class Status extends StatusValue {
 		$rawErrors = $this->getErrors();
 		if ( count( $rawErrors ) === 0 ) {
 			if ( $this->isOK() ) {
-				$this->fatal( 'internalerror_info',
-					__METHOD__ . " called for a good result, this is incorrect\n" );
+				$this->fatal(
+					'internalerror_info',
+					__METHOD__ . " called for a good result, this is incorrect\n"
+				);
 			} else {
-				$this->fatal( 'internalerror_info',
-					__METHOD__ . ": Invalid result object: no error text but not OK\n" );
+				$this->fatal(
+					'internalerror_info',
+					__METHOD__ . ": Invalid result object: no error text but not OK\n"
+				);
 			}
 			$rawErrors = $this->getErrors(); // just added a fatal
 		}
@@ -352,14 +371,20 @@ class Status extends StatusValue {
 				// Apply context from MessageLocalizer even if we have a Message object already
 				$msg = $this->msg( $error['message'] );
 			} elseif ( isset( $error['message'] ) && isset( $error['params'] ) ) {
-				$msg = $this->msg( $error['message'], array_map( static function ( $param ) {
-					return is_string( $param ) ? wfEscapeWikiText( $param ) : $param;
-				}, $this->cleanParams( $error['params'] ) ) );
+				$msg = $this->msg(
+					$error['message'],
+					array_map( static function ( $param ) {
+						return is_string( $param ) ? wfEscapeWikiText( $param ) : $param;
+					}, $this->cleanParams( $error['params'] ) )
+				);
 			} else {
 				$msgName = array_shift( $error );
-				$msg = $this->msg( $msgName, array_map( static function ( $param ) {
-					return is_string( $param ) ? wfEscapeWikiText( $param ) : $param;
-				}, $this->cleanParams( $error ) ) );
+				$msg = $this->msg(
+					$msgName,
+					array_map( static function ( $param ) {
+						return is_string( $param ) ? wfEscapeWikiText( $param ) : $param;
+					}, $this->cleanParams( $error ) )
+				);
 			}
 		} elseif ( is_string( $error ) ) {
 			$msg = $this->msg( $error );
@@ -471,3 +496,5 @@ class Status extends StatusValue {
 		return $msg;
 	}
 }
+
+class_alias( Status::class, 'Status' );

includes/Storage/Hook/MultiContentSaveHook.php

@@ -4,8 +4,8 @@ namespace MediaWiki\Storage\Hook;
 
 use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Revision\RenderedRevision;
+use MediaWiki\Status\Status;
 use MediaWiki\User\UserIdentity;
-use Status;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/Storage/PageUpdateStatus.php

@@ -21,7 +21,7 @@
 namespace MediaWiki\Storage;
 
 use MediaWiki\Revision\RevisionRecord;
-use Status;
+use MediaWiki\Status\Status;
 
 /**
  * Status object representing the outcome of a page update.

includes/actions/DeleteAction.php

@@ -27,6 +27,7 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\DeletePage;
 use MediaWiki\Page\DeletePageFactory;
 use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\UserOptionsLookup;
 use MediaWiki\Watchlist\WatchlistManager;

includes/actions/FormAction.php

@@ -20,6 +20,8 @@
  * @ingroup Actions
  */
 
+use MediaWiki\Status\Status;
+
 /**
  * An action which shows a form and does something based on the input from the form
  *

includes/actions/Hook/UnwatchArticleHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use Status;
+use MediaWiki\Status\Status;
 use User;
 use WikiPage;
 

includes/actions/Hook/WatchArticleHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use Status;
+use MediaWiki\Status\Status;
 use User;
 use WikiPage;
 

includes/actions/McrUndoAction.php

@@ -17,6 +17,7 @@ use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\RevisionRenderer;
 use MediaWiki\Revision\SlotRecord;
+use MediaWiki\Status\Status;
 use MediaWiki\Storage\EditResult;
 use Wikimedia\Rdbms\ReadOnlyMode;
 

includes/actions/RevertAction.php

@@ -24,6 +24,7 @@
  */
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Status\Status;
 use MediaWiki\Utils\MWTimestamp;
 
 /**

includes/actions/WatchAction.php

@@ -21,6 +21,7 @@
  */
 
 use MediaWiki\MainConfigNames;
+use MediaWiki\Status\Status;
 use MediaWiki\Watchlist\WatchlistManager;
 use Wikimedia\ParamValidator\TypeDef\ExpiryDef;
 

includes/api/ApiAuthManagerHelper.php

@@ -27,6 +27,7 @@ use MediaWiki\Auth\AuthManager;
 use MediaWiki\Auth\CreateFromLoginAuthenticationRequest;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Status\Status;
 use Wikimedia\ParamValidator\ParamValidator;
 
 /**

includes/api/ApiBase.php

@@ -33,6 +33,7 @@ use MediaWiki\ParamValidator\TypeDef\NamespaceDef;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Permissions\PermissionStatus;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserRigorOptions;
 use Wikimedia\ParamValidator\ParamValidator;

includes/api/ApiDelete.php

@@ -24,6 +24,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\Page\DeletePage;
 use MediaWiki\Page\DeletePageFactory;
 use MediaWiki\Page\File\FileDeleteForm;
+use MediaWiki\Status\Status;
 use MediaWiki\User\UserOptionsLookup;
 use MediaWiki\Watchlist\WatchlistManager;
 use Wikimedia\ParamValidator\ParamValidator;

includes/api/ApiEmailUser.php

@@ -21,6 +21,7 @@
  */
 
 use MediaWiki\Specials\SpecialEmailUser;
+use MediaWiki\Status\Status;
 use Wikimedia\ParamValidator\ParamValidator;
 
 /**

includes/api/ApiImageRotate.php

@@ -19,6 +19,7 @@
  */
 
 use MediaWiki\FileBackend\FSFile\TempFSFileFactory;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\TitleFactory;
 use Wikimedia\ParamValidator\ParamValidator;
 

includes/api/ApiMergeHistory.php

@@ -22,6 +22,7 @@
 
 use MediaWiki\Page\MergeHistoryFactory;
 use MediaWiki\Page\PageIdentity;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use Wikimedia\ParamValidator\ParamValidator;
 

includes/api/ApiMove.php

@@ -22,6 +22,7 @@
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\MovePageFactory;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserOptionsLookup;
 use MediaWiki\Watchlist\WatchlistManager;

includes/api/ApiQueryRevisions.php

@@ -28,6 +28,7 @@ use MediaWiki\ParamValidator\TypeDef\UserDef;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\RevisionStore;
 use MediaWiki\Revision\SlotRoleRegistry;
+use MediaWiki\Status\Status;
 use MediaWiki\Storage\NameTableAccessException;
 use MediaWiki\Storage\NameTableStore;
 use MediaWiki\Title\Title;

includes/api/ApiQuerySearch.php

@@ -21,6 +21,7 @@
  */
 
 use MediaWiki\Search\TitleMatcher;
+use MediaWiki\Status\Status;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\ParamValidator\TypeDef\EnumDef;
 

includes/api/ApiResetPassword.php

@@ -22,6 +22,7 @@
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\ParamValidator\TypeDef\UserDef;
+use MediaWiki\Status\Status;
 use Wikimedia\ParamValidator\ParamValidator;
 
 /**

includes/api/ApiRevisionDelete.php

@@ -22,6 +22,7 @@
  */
 
 use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use Wikimedia\ParamValidator\ParamValidator;
 

includes/api/ApiUpload.php

@@ -21,6 +21,7 @@
  */
 
 use MediaWiki\MainConfigNames;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserOptionsLookup;
 use MediaWiki\Watchlist\WatchlistManager;

includes/api/ApiUsageException.php

@@ -18,6 +18,8 @@
  * @file
  */
 
+use MediaWiki\Status\Status;
+
 /**
  * Exception used to abort API execution with an error
  *

includes/auth/AbstractPasswordPrimaryAuthenticationProvider.php

@@ -22,9 +22,9 @@
 namespace MediaWiki\Auth;
 
 use MediaWiki\MainConfigNames;
+use MediaWiki\Status\Status;
 use Password;
 use PasswordFactory;
-use Status;
 
 /**
  * Basic framework for a primary authentication provider that uses passwords

includes/auth/AuthManager.php

@@ -33,6 +33,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Permissions\PermissionStatus;
+use MediaWiki\Status\Status;
 use MediaWiki\User\BotPasswordStore;
 use MediaWiki\User\TempUser\TempUserCreator;
 use MediaWiki\User\UserFactory;
@@ -46,7 +47,6 @@ use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use SpecialPage;
-use Status;
 use StatusValue;
 use User;
 use WebRequest;

includes/auth/ConfirmLinkSecondaryAuthenticationProvider.php

@@ -131,7 +131,7 @@ class ConfirmLinkSecondaryAuthenticationProvider extends AbstractSecondaryAuthen
 			return AuthenticationResponse::newPass();
 		}
 
-		$combinedStatus = \Status::newGood();
+		$combinedStatus = \MediaWiki\Status\Status::newGood();
 		foreach ( $statuses as [ $req, $status ] ) {
 			$descriptionInfo = $req->describeCredentials();
 			$description = wfMessage(

includes/auth/LocalPasswordPrimaryAuthenticationProvider.php

@@ -72,12 +72,12 @@ class LocalPasswordPrimaryAuthenticationProvider
 		if ( (int)$expiration + $grace < $now ) {
 			$data = [
 				'hard' => true,
-				'msg' => \Status::newFatal( 'resetpass-expired' )->getMessage(),
+				'msg' => \MediaWiki\Status\Status::newFatal( 'resetpass-expired' )->getMessage(),
 			];
 		} else {
 			$data = [
 				'hard' => false,
-				'msg' => \Status::newFatal( 'resetpass-expired-soft' )->getMessage(),
+				'msg' => \MediaWiki\Status\Status::newFatal( 'resetpass-expired-soft' )->getMessage(),
 			];
 		}
 

includes/auth/TemporaryPasswordPrimaryAuthenticationProvider.php

@@ -422,13 +422,13 @@ class TemporaryPasswordPrimaryAuthenticationProvider
 	 * @param User $user The new user account
 	 * @param User $creatingUser The user who created the account (can be anonymous)
 	 * @param string $password The temporary password
-	 * @return \Status
+	 * @return \MediaWiki\Status\Status
 	 */
 	protected function sendNewAccountEmail( User $user, User $creatingUser, $password ) {
 		$ip = $creatingUser->getRequest()->getIP();
 		// @codeCoverageIgnoreStart
 		if ( !$ip ) {
-			return \Status::newFatal( 'badipaddress' );
+			return \MediaWiki\Status\Status::newFatal( 'badipaddress' );
 		}
 		// @codeCoverageIgnoreEnd
 
@@ -456,12 +456,12 @@ class TemporaryPasswordPrimaryAuthenticationProvider
 
 	/**
 	 * @param TemporaryPasswordAuthenticationRequest $req
-	 * @return \Status
+	 * @return \MediaWiki\Status\Status
 	 */
 	protected function sendPasswordResetEmail( TemporaryPasswordAuthenticationRequest $req ) {
 		$user = User::newFromName( $req->username );
 		if ( !$user ) {
-			return \Status::newFatal( 'noname' );
+			return \MediaWiki\Status\Status::newFatal( 'noname' );
 		}
 		$userLanguage = $this->userOptionsLookup->getOption( $user, 'language' );
 		$callerIsAnon = IPUtils::isValid( $req->caller );

includes/block/BlockUser.php

@@ -33,6 +33,7 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Permissions\Authority;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\TempUser\TempUserConfig;
@@ -42,7 +43,6 @@ use MediaWiki\User\UserIdentity;
 use Message;
 use Psr\Log\LoggerInterface;
 use RevisionDeleteUser;
-use Status;
 use Wikimedia\Timestamp\ConvertibleTimestamp;
 
 /**

includes/block/BlockUtils.php

@@ -23,11 +23,11 @@ namespace MediaWiki\Block;
 
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Status\Status;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityLookup;
 use MediaWiki\User\UserIdentityValue;
 use MediaWiki\User\UserNameUtils;
-use Status;
 use Wikimedia\IPUtils;
 
 /**

includes/block/UnblockUser.php

@@ -26,10 +26,10 @@ use ManualLogEntry;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Permissions\Authority;
+use MediaWiki\Status\Status;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;
 use RevisionDeleteUser;
-use Status;
 use TitleValue;
 
 /**

includes/changetags/ChangeTags.php

@@ -27,6 +27,7 @@ use MediaWiki\Language\RawMessage;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Permissions\Authority;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
 use Wikimedia\Rdbms\IReadableDatabase;

includes/changetags/ChangeTagsList.php

@@ -21,6 +21,7 @@
 
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Permissions\Authority;
+use MediaWiki\Status\Status;
 
 /**
  * Generic list for change tagging.

includes/changetags/ChangeTagsLogList.php

@@ -20,6 +20,7 @@
  */
 
 use MediaWiki\Permissions\Authority;
+use MediaWiki\Status\Status;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IResultWrapper;
 

includes/changetags/ChangeTagsRevisionList.php

@@ -21,6 +21,7 @@
 
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Permissions\Authority;
+use MediaWiki\Status\Status;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IResultWrapper;
 

includes/changetags/ChangeTagsStore.php

@@ -28,6 +28,7 @@ use MediaWiki\Config\ServiceOptions;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Status\Status;
 use MediaWiki\Storage\NameTableAccessException;
 use MediaWiki\Storage\NameTableStore;
 use MediaWiki\Title\Title;
@@ -35,7 +36,6 @@ use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;
 use Psr\Log\LoggerInterface;
 use RecentChange;
-use Status;
 use WANObjectCache;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\IConnectionProvider;

includes/changetags/Hook/ChangeTagAfterDeleteHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\ChangeTags\Hook;
 
-use Status;
+use MediaWiki\Status\Status;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/changetags/Hook/ChangeTagCanCreateHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\ChangeTags\Hook;
 
-use Status;
+use MediaWiki\Status\Status;
 use User;
 
 /**

includes/changetags/Hook/ChangeTagCanDeleteHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\ChangeTags\Hook;
 
-use Status;
+use MediaWiki\Status\Status;
 use User;
 
 /**

includes/content/AbstractContent.php

@@ -34,6 +34,7 @@ use MediaWiki\Content\ValidationParams;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Parser\MagicWord;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 
 /**

includes/content/Content.php

@@ -19,6 +19,7 @@
  */
 
 use MediaWiki\Parser\MagicWord;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 
 /**

includes/content/ContentModelChange.php

@@ -8,6 +8,7 @@ use MediaWiki\Permissions\Authority;
 use MediaWiki\Permissions\PermissionStatus;
 use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Revision\SlotRecord;
+use MediaWiki\Status\Status;
 use MediaWiki\User\UserFactory;
 
 /**

includes/content/JsonContent.php

@@ -9,6 +9,7 @@
  */
 
 use MediaWiki\Html\Html;
+use MediaWiki\Status\Status;
 
 /**
  * JSON text content that can be viewed and edit directly by users.

includes/diff/TextSlotDiffRenderer.php

@@ -28,6 +28,7 @@ use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Html\Html;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use OOUI\ButtonGroupWidget;
 use OOUI\ButtonWidget;

includes/editpage/Constraint/EditFilterMergedContentHookConstraint.php

@@ -27,8 +27,8 @@ use Language;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Html\Html;
+use MediaWiki\Status\Status;
 use Message;
-use Status;
 use StatusValue;
 use User;
 

includes/editpage/EditPage.php

@@ -78,6 +78,7 @@ use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\RevisionStore;
 use MediaWiki\Revision\RevisionStoreRecord;
 use MediaWiki\Revision\SlotRecord;
+use MediaWiki\Status\Status;
 use MediaWiki\Storage\EditResult;
 use MediaWiki\Storage\PageUpdater;
 use MediaWiki\Title\Title;
@@ -105,7 +106,6 @@ use ReadOnlyError;
 use RecentChange;
 use RuntimeException;
 use Skin;
-use Status;
 use stdClass;
 use TextContent;
 use ThrottledError;

includes/filebackend/FileBackendGroup.php

@@ -26,6 +26,7 @@ use MediaWiki\FileBackend\FSFile\TempFSFileFactory;
 use MediaWiki\FileBackend\LockManager\LockManagerGroupFactory;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Status\Status;
 use Wikimedia\ObjectFactory\ObjectFactory;
 use Wikimedia\Rdbms\ConfiguredReadOnlyMode;
 

includes/filerepo/FileRepo.php

@@ -12,6 +12,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Permissions\Authority;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\Utils\MWTimestamp;

includes/filerepo/LocalRepo.php

@@ -23,6 +23,7 @@ use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Permissions\Authority;
+use MediaWiki\Status\Status;
 use MediaWiki\Storage\BlobStore;
 use MediaWiki\Title\Title;
 use MediaWiki\WikiMap\WikiMap;

includes/filerepo/file/File.php

@@ -12,6 +12,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Permissions\Authority;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
 

includes/filerepo/file/ForeignDBFile.php

@@ -19,6 +19,7 @@
  */
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
 use Wikimedia\Rdbms\DBUnexpectedError;

includes/filerepo/file/LocalFile.php

@@ -25,6 +25,7 @@ use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Permissions\Authority;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;

includes/filerepo/file/LocalFileDeleteBatch.php

@@ -21,6 +21,7 @@
 use MediaWiki\FileRepo\File\FileSelectQueryBuilder;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\Status\Status;
 use MediaWiki\User\UserIdentity;
 use Wikimedia\ScopedCallback;
 

includes/filerepo/file/LocalFileLockError.php

@@ -18,6 +18,8 @@
  * @file
  */
 
+use MediaWiki\Status\Status;
+
 /**
  * @newable
  * @stable to extend

includes/filerepo/file/LocalFileMoveBatch.php

@@ -20,6 +20,7 @@
 
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use Psr\Log\LoggerInterface;
 use Wikimedia\Rdbms\IDatabase;

includes/filerepo/file/LocalFileRestoreBatch.php

@@ -20,6 +20,7 @@
 
 use MediaWiki\FileRepo\File\FileSelectQueryBuilder;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Status\Status;
 use Wikimedia\Rdbms\SelectQueryBuilder;
 use Wikimedia\ScopedCallback;
 

includes/filerepo/file/MetadataStorageHelper.php

@@ -19,6 +19,7 @@
  */
 
 use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\Status\Status;
 use MediaWiki\Storage\BlobStore;
 
 /**

includes/filerepo/file/OldLocalFile.php

@@ -22,6 +22,7 @@ use MediaWiki\FileRepo\File\FileSelectQueryBuilder;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
 use Wikimedia\Rdbms\IReadableDatabase;

includes/htmlform/HTMLForm.php

@@ -27,6 +27,7 @@ use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageReference;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 
 /**

includes/htmlform/HTMLFormField.php

@@ -2,6 +2,7 @@
 
 use MediaWiki\Html\Html;
 use MediaWiki\Linker\Linker;
+use MediaWiki\Status\Status;
 
 /**
  * The parent class to generate form fields.  Any field type should

includes/htmlform/OOUIHTMLForm.php

@@ -23,6 +23,7 @@
 
 use MediaWiki\Html\Html;
 use MediaWiki\Linker\Linker;
+use MediaWiki\Status\Status;
 
 /**
  * Compact stacked vertical format for forms, implemented using OOUI widgets.

includes/htmlform/fields/HTMLRestrictionsField.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Status\Status;
 use Wikimedia\IPUtils;
 
 /**

includes/http/GuzzleHttpRequest.php

@@ -23,6 +23,7 @@ use GuzzleHttp\HandlerStack;
 use GuzzleHttp\MessageFormatter;
 use GuzzleHttp\Middleware;
 use GuzzleHttp\Psr7\Request;
+use MediaWiki\Status\Status;
 use Psr\Http\Message\RequestInterface;
 use Psr\Log\NullLogger;
 

includes/http/HttpRequestFactory.php

@@ -24,11 +24,11 @@ use GuzzleHttpRequest;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Status\Status;
 use MultiHttpClient;
 use MWHttpRequest;
 use Profiler;
 use Psr\Log\LoggerInterface;
-use Status;
 
 /**
  * Factory creating MWHttpRequest objects.

includes/http/MWHttpRequest.php

@@ -21,6 +21,7 @@
 use MediaWiki\Http\Telemetry;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Status\Status;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;

includes/import/ImportStreamSource.php

@@ -26,6 +26,7 @@
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Status\Status;
 use Wikimedia\AtEase\AtEase;
 
 /**

includes/import/WikiImporter.php

@@ -35,6 +35,7 @@ use MediaWiki\Page\WikiPageFactory;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Revision\SlotRoleRegistry;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleFactory;
 use Wikimedia\AtEase\AtEase;

includes/installer/CliInstaller.php

@@ -23,6 +23,7 @@
 
 use MediaWiki\Installer\InstallException;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Status\Status;
 
 /**
  * Class for the core installer command line interface.

includes/installer/DatabaseInstaller.php

@@ -22,6 +22,7 @@
  */
 
 use MediaWiki\Html\Html;
+use MediaWiki\Status\Status;
 use Wikimedia\AtEase\AtEase;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\DatabaseDomain;

includes/installer/InstallException.php

@@ -28,23 +28,23 @@ use Throwable;
  */
 class InstallException extends \MWException {
 	/**
-	 * @var \Status State when an exception occurs
+	 * @var \MediaWiki\Status\Status State when an exception occurs
 	 */
 	private $status;
 
 	/**
-	 * @param \Status $status State when an exception occurs
+	 * @param \MediaWiki\Status\Status $status State when an exception occurs
 	 * @param string $message The Exception message to throw
 	 * @param int $code The Exception code
 	 * @param Throwable|null $previous The previous throwable used for the exception chaining
 	 */
-	public function __construct( \Status $status, $message = '', $code = 0,
+	public function __construct( \MediaWiki\Status\Status $status, $message = '', $code = 0,
 		Throwable $previous = null ) {
 		parent::__construct( $message, $code, $previous );
 		$this->status = $status;
 	}
 
-	public function getStatus(): \Status {
+	public function getStatus(): \MediaWiki\Status\Status {
 		return $this->status;
 	}
 }

includes/installer/Installer.php

@@ -32,6 +32,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\MainConfigSchema;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Settings\SettingsBuilder;
+use MediaWiki\Status\Status;
 use MediaWiki\StubObject\StubGlobalUser;
 use MediaWiki\Title\Title;
 use Wikimedia\AtEase\AtEase;

includes/installer/MysqlInstaller.php

@@ -23,6 +23,7 @@
 
 use MediaWiki\Html\Html;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Status\Status;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\DatabaseFactory;
 use Wikimedia\Rdbms\DBConnectionError;

includes/installer/PostgresInstaller.php

@@ -23,6 +23,7 @@
 
 use MediaWiki\Html\Html;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Status\Status;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\DatabaseFactory;
 use Wikimedia\Rdbms\DatabasePostgres;

includes/installer/SqliteInstaller.php

@@ -22,6 +22,7 @@
  */
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Status\Status;
 use Wikimedia\AtEase\AtEase;
 use Wikimedia\Rdbms\DatabaseFactory;
 use Wikimedia\Rdbms\DatabaseSqlite;

includes/installer/WebInstaller.php

@@ -24,6 +24,7 @@
 use MediaWiki\Html\Html;
 use MediaWiki\Languages\LanguageNameUtils;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Status\Status;
 
 /**
  * Class for the core installer web interface.

includes/installer/WebInstallerDBConnect.php

@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Html\Html;
+use MediaWiki\Status\Status;
 
 /**
  * This program is free software; you can redistribute it and/or modify

includes/installer/WebInstallerExistingWiki.php

@@ -1,4 +1,7 @@
 <?php
+
+use MediaWiki\Status\Status;
+
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

includes/installer/WebInstallerInstall.php

@@ -1,4 +1,7 @@
 <?php
+
+use MediaWiki\Status\Status;
+
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

includes/jobqueue/jobs/AssembleUploadChunksJob.php

@@ -19,6 +19,7 @@
  */
 
 use MediaWiki\Request\WebRequestUpload;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use Wikimedia\ScopedCallback;
 

includes/jobqueue/jobs/PublishStashedFileJob.php

@@ -18,6 +18,7 @@
  * @file
  */
 
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use Wikimedia\ScopedCallback;
 

includes/jobqueue/jobs/ThumbnailRenderJob.php

@@ -20,6 +20,7 @@
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 
 /**

includes/json/FormatJson.php

@@ -20,6 +20,8 @@
  * @file
  */
 
+use MediaWiki\Status\Status;
+
 /**
  * JSON formatter wrapper class
  */

includes/logging/LogEventsList.php

@@ -31,6 +31,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Permissions\Authority;
+use MediaWiki\Status\Status;
 
 class LogEventsList extends ContextSource {
 	public const NO_ACTION_LINK = 1;

includes/mail/EmailNotification.php

@@ -29,6 +29,7 @@ use MediaWiki\Mail\UserEmailContact;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Permissions\Authority;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
 

includes/mail/UserMailer.php

@@ -28,6 +28,7 @@
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Status\Status;
 use MediaWiki\Utils\MWTimestamp;
 use MediaWiki\WikiMap\WikiMap;
 

includes/media/MediaHandler.php

@@ -21,6 +21,7 @@
 
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Status\Status;
 
 /**
  * @defgroup Media Media

includes/media/MediaTransformOutput.php

@@ -24,6 +24,7 @@
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Status\Status;
 
 /**
  * Base class for the output of MediaHandler::doTransform() and File::transform().

includes/page/Article.php

@@ -38,6 +38,7 @@ use MediaWiki\Revision\BadRevisionException;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\RevisionStore;
 use MediaWiki\Revision\SlotRecord;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserNameUtils;

includes/page/DeletePage.php

@@ -29,12 +29,12 @@ use MediaWiki\ResourceLoader\WikiModule;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\RevisionStore;
 use MediaWiki\Revision\SlotRecord;
+use MediaWiki\Status\Status;
 use MediaWiki\User\UserFactory;
 use Message;
 use NamespaceInfo;
 use SearchUpdate;
 use SiteStatsUpdate;
-use Status;
 use StatusValue;
 use Wikimedia\IPUtils;
 use Wikimedia\Message\ITextFormatter;

includes/page/File/FileDeleteForm.php

@@ -29,10 +29,10 @@ use ManualLogEntry;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\DeletePage;
+use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
 use MWException;
-use Status;
 
 /**
  * File deletion user interface

includes/page/Hook/ArticleDeleteHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Page\Hook;
 
-use Status;
+use MediaWiki\Status\Status;
 use User;
 use WikiPage;