Namespace includes/context

Bug: T353458
Change-Id: I4dbef138fd0110c14c70214282519189d70c94fb

RELEASE-NOTES-1.42

@@ -401,6 +401,12 @@ because of Phabricator reports.
   In this release of MediaWiki, XYZ classes now have a namespace and XYZ do
   not yet (XYZ% done, up from 63% in MediaWiki 1.41.0). The following have newly
   been moved:
+  - MediaWiki\Context:
+    - ContextSource
+    - DerivativeContextSource
+    - IContextSource
+    - MutableContext
+    - RequestContext
   - MediaWiki\Deferred:
     - AtomicSectionUpdate
     - AutoCommitUpdate

api.php

@@ -26,6 +26,7 @@
  */
 
 use MediaWiki\Api\ApiEntryPoint;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\EntryPointEnvironment;
 use MediaWiki\MediaWikiServices;
 

autoload.php

@@ -1020,6 +1020,11 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Content\\Transform\\PreloadTransformParams' => __DIR__ . '/includes/content/Transform/PreloadTransformParams.php',
 	'MediaWiki\\Content\\Transform\\PreloadTransformParamsValue' => __DIR__ . '/includes/content/Transform/PreloadTransformParamsValue.php',
 	'MediaWiki\\Content\\ValidationParams' => __DIR__ . '/includes/content/ValidationParams.php',
+	'MediaWiki\\Context\\ContextSource' => __DIR__ . '/includes/context/ContextSource.php',
+	'MediaWiki\\Context\\DerivativeContext' => __DIR__ . '/includes/context/DerivativeContext.php',
+	'MediaWiki\\Context\\IContextSource' => __DIR__ . '/includes/context/IContextSource.php',
+	'MediaWiki\\Context\\MutableContext' => __DIR__ . '/includes/context/MutableContext.php',
+	'MediaWiki\\Context\\RequestContext' => __DIR__ . '/includes/context/RequestContext.php',
 	'MediaWiki\\DAO\\WikiAwareEntity' => __DIR__ . '/includes/dao/WikiAwareEntity.php',
 	'MediaWiki\\DAO\\WikiAwareEntityTrait' => __DIR__ . '/includes/dao/WikiAwareEntityTrait.php',
 	'MediaWiki\\DB\\AbstractSchemaValidationError' => __DIR__ . '/includes/db/AbstractSchemaValidationError.php',

img_auth.php

@@ -39,6 +39,7 @@
  * @ingroup entrypoint
  */
 
+use MediaWiki\Context\RequestContext;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Html\TemplateParser;
 use MediaWiki\Request\WebRequest;

includes/Category/CategoryViewer.php

@@ -23,15 +23,15 @@
 namespace MediaWiki\Category;
 
 use Collation;
-use ContextSource;
 use DeprecationHelper;
 use HtmlArmor;
-use IContextSource;
 use ILanguageConverter;
 use ImageGalleryBase;
 use ImageGalleryClassNotFoundException;
 use InvalidArgumentException;
 use LinkCache;
+use MediaWiki\Context\ContextSource;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\HookContainer\ProtectedHookAccessorTrait;
 use MediaWiki\Html\Html;
 use MediaWiki\Linker\LinkTarget;

includes/Feed/FeedUtils.php

@@ -23,8 +23,9 @@
 
 namespace MediaWiki\Feed;
 
-use DerivativeContext;
 use LogFormatter;
+use MediaWiki\Context\DerivativeContext;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Html\Html;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
@@ -32,7 +33,6 @@ use MediaWiki\Output\OutputPage;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Title\Title;
-use RequestContext;
 use TextContent;
 use UtfNormal;
 

includes/Hook/EditFilterMergedContentHook.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Hook;
 
 use Content;
-use IContextSource;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Status\Status;
 use MediaWiki\User\User;
 

includes/HookContainer/HookRunner.php

@@ -4,10 +4,10 @@ namespace MediaWiki\HookContainer;
 
 use Article;
 use File;
-use IContextSource;
 use JsonContent;
 use MailAddress;
 use ManualLogEntry;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Mail\UserEmailContact;

includes/MediaWiki.php

@@ -20,6 +20,8 @@
  * @file
  */
 
+use MediaWiki\Context\IContextSource;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\EntryPointEnvironment;
 use MediaWiki\MediaWikiEntryPoint;
 use MediaWiki\MediaWikiServices;

includes/MediaWikiEntryPoint.php

@@ -23,7 +23,6 @@ namespace MediaWiki;
 use Exception;
 use HttpStatus;
 use IBufferingStatsdDataFactory;
-use IContextSource;
 use JobQueueGroup;
 use JobRunner;
 use Liuggio\StatsdClient\Sender\SocketSender;
@@ -31,6 +30,7 @@ use LogicException;
 use MediaWiki\Block\BlockManager;
 use MediaWiki\Config\Config;
 use MediaWiki\Config\ConfigException;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Deferred\TransactionRoundDefiningUpdate;
 use MediaWiki\HookContainer\ProtectedHookAccessorTrait;

includes/Output/IframeSandbox.php

@@ -3,9 +3,10 @@
 namespace MediaWiki\Output;
 
 use DomainException;
-use IContextSource;
 use MediaWiki\Config\HashConfig;
 use MediaWiki\Config\MultiConfig;
+use MediaWiki\Context\IContextSource;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Html\Html;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Request\ContentSecurityPolicy;
@@ -14,7 +15,6 @@ use MediaWiki\Request\FauxResponse;
 use MediaWiki\Specials\SpecialIframeError;
 use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\UserFactory;
-use RequestContext;
 use SkinFactory;
 use Wikimedia\Assert\Assert;
 

includes/Output/IframeSandboxFactory.php

@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Output;
 
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\UserFactory;
-use RequestContext;
 use SkinFactory;
 
 /**

includes/Output/OutputPage.php

@@ -24,19 +24,20 @@ namespace MediaWiki\Output;
 
 use Article;
 use Content;
-use ContextSource;
 use CSSJanus;
 use Exception;
 use ExtensionRegistry;
 use File;
 use HtmlArmor;
-use IContextSource;
 use InvalidArgumentException;
 use JavaScriptContent;
 use Language;
 use LanguageCode;
 use LinkCache;
 use MediaWiki\Config\Config;
+use MediaWiki\Context\ContextSource;
+use MediaWiki\Context\IContextSource;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\HookContainer\ProtectedHookAccessorTrait;
 use MediaWiki\Html\Html;
 use MediaWiki\Linker\LinkTarget;
@@ -64,7 +65,6 @@ use OOUI\Element;
 use OOUI\Theme;
 use Parser;
 use ParserOptions;
-use RequestContext;
 use RuntimeException;
 use Skin;
 use TextContent;

includes/OutputTransform/Stages/HandleSectionLinks.php

@@ -2,6 +2,7 @@
 
 namespace MediaWiki\OutputTransform\Stages;
 
+use MediaWiki\Context\RequestContext;
 use MediaWiki\OutputTransform\ContentTextTransformStage;
 use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\Sanitizer;
@@ -9,7 +10,6 @@ use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleFactory;
 use ParserOptions;
 use Psr\Log\LoggerInterface;
-use RequestContext;
 use Skin;
 
 /**

includes/OutputTransform/Stages/HandleTOCMarkers.php

@@ -3,6 +3,7 @@
 namespace MediaWiki\OutputTransform\Stages;
 
 use Language;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Linker\Linker;
 use MediaWiki\OutputTransform\ContentTextTransformStage;
 use MediaWiki\Parser\ParserOutput;
@@ -10,7 +11,6 @@ use MediaWiki\Parser\Sanitizer;
 use MediaWiki\Tidy\TidyDriverBase;
 use Parser;
 use ParserOptions;
-use RequestContext;
 
 /**
  * Inject table of contents (or empty string if there's no sections)

includes/Permissions/PermissionManager.php

@@ -19,7 +19,6 @@
  */
 namespace MediaWiki\Permissions;
 
-use IContextSource;
 use InvalidArgumentException;
 use LogicException;
 use MediaWiki\Actions\ActionFactory;
@@ -28,6 +27,8 @@ use MediaWiki\Block\Block;
 use MediaWiki\Block\BlockErrorFormatter;
 use MediaWiki\Block\BlockManager;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Context\IContextSource;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Linker\LinkTarget;
@@ -51,7 +52,6 @@ use MediaWiki\User\UserIdentity;
 use Message;
 use MessageSpecifier;
 use PermissionsError;
-use RequestContext;
 use StatusValue;
 use UserCache;
 use Wikimedia\ScopedCallback;

includes/Permissions/UserAuthority.php

@@ -20,11 +20,11 @@
 
 namespace MediaWiki\Permissions;
 
-use IContextSource;
 use IDBAccessObject;
 use InvalidArgumentException;
 use MediaWiki\Block\Block;
 use MediaWiki\Block\BlockErrorFormatter;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Request\WebRequest;

includes/Rest/EntryPoint.php

@@ -3,10 +3,11 @@
 namespace MediaWiki\Rest;
 
 use ExtensionRegistry;
-use IContextSource;
 use MediaWiki;
 use MediaWiki\Config\Config;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Context\IContextSource;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Request\WebResponse;
@@ -16,7 +17,6 @@ use MediaWiki\Rest\Reporter\MWErrorReporter;
 use MediaWiki\Rest\Validator\Validator;
 use MediaWiki\Title\Title;
 use MWExceptionRenderer;
-use RequestContext;
 use Wikimedia\Message\ITextFormatter;
 
 class EntryPoint {

includes/Rest/Handler/ActionModuleBasedHandler.php

@@ -7,13 +7,13 @@ use ApiMain;
 use ApiMessage;
 use ApiUsageException;
 use IApiMessage;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Request\WebResponse;
 use MediaWiki\Rest\Handler;
 use MediaWiki\Rest\HttpException;
 use MediaWiki\Rest\LocalizedHttpException;
 use MediaWiki\Rest\Response;
-use RequestContext;
 use Wikimedia\Message\ListParam;
 use Wikimedia\Message\MessageParam;
 use Wikimedia\Message\MessageValue;

includes/Rest/Handler/ParsoidHandler.php

@@ -25,6 +25,7 @@ use InvalidArgumentException;
 use LanguageCode;
 use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
 use LogicException;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
@@ -46,7 +47,6 @@ use MediaWiki\Title\MalformedTitleException;
 use MediaWiki\Title\Title;
 use MediaWiki\WikiMap\WikiMap;
 use MobileContext;
-use RequestContext;
 use Wikimedia\Http\HttpAcceptParser;
 use Wikimedia\Message\DataMessageValue;
 use Wikimedia\Parsoid\Config\DataAccess;
@@ -139,7 +139,7 @@ abstract class ParsoidHandler extends Handler {
 		// We are cutting some corners here (IDN, non-ASCII casing)
 		// since domain name support is provisional.
 		// TODO use a proper validator instead
-		$server = \RequestContext::getMain()->getConfig()->get( MainConfigNames::Server );
+		$server = RequestContext::getMain()->getConfig()->get( MainConfigNames::Server );
 		$services = MediaWikiServices::getInstance();
 		$expectedDomain = $services->getUrlUtils()->parse( $server )['host'] ?? null;
 		if ( !$expectedDomain ) {

includes/Rest/Handler/SearchHandler.php

@@ -6,6 +6,7 @@ use InvalidArgumentException;
 use ISearchResultSet;
 use MediaWiki\Cache\CacheKeyHelper;
 use MediaWiki\Config\Config;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Language\FormatterFactory;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageIdentity;
@@ -18,7 +19,6 @@ use MediaWiki\Rest\Response;
 use MediaWiki\Search\Entity\SearchResultThumbnail;
 use MediaWiki\Search\SearchResultThumbnailProvider;
 use MediaWiki\Title\TitleFormatter;
-use RequestContext;
 use SearchEngine;
 use SearchEngineConfig;
 use SearchEngineFactory;

includes/Revision/ContributionsLookup.php

@@ -3,9 +3,10 @@
 namespace MediaWiki\Revision;
 
 use ChangeTags;
-use IContextSource;
 use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\CommentFormatter\CommentFormatter;
+use MediaWiki\Context\IContextSource;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Linker\LinkRendererFactory;
 use MediaWiki\Pager\ContribsPager;
@@ -14,7 +15,6 @@ use MediaWiki\Request\FauxRequest;
 use MediaWiki\Title\NamespaceInfo;
 use MediaWiki\User\UserIdentity;
 use Message;
-use RequestContext;
 use Wikimedia\Rdbms\IConnectionProvider;
 
 /**

includes/ServiceWiring.php

@@ -79,6 +79,7 @@ use MediaWiki\Content\ContentHandlerFactory;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Content\Renderer\ContentRenderer;
 use MediaWiki\Content\Transform\ContentTransformer;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\DAO\WikiAwareEntity;
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Edit\ParsoidOutputStash;

includes/Setup.php

@@ -52,6 +52,7 @@
 
 // phpcs:disable MediaWiki.Usage.DeprecatedGlobalVariables
 use MediaWiki\Config\SiteConfiguration;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\HookContainer\FauxGlobalHookArray;
 use MediaWiki\HookContainer\HookRunner;

includes/Status/Status.php

@@ -22,13 +22,13 @@
 
 namespace MediaWiki\Status;
 
-use IContextSource;
 use Language;
+use MediaWiki\Context\IContextSource;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\StubObject\StubUserLang;
 use Message;
 use MessageLocalizer;
-use RequestContext;
 use RuntimeException;
 use StatusValue;
 

includes/StubObject/StubUserLang.php

@@ -21,7 +21,7 @@
 namespace MediaWiki\StubObject;
 
 use Language;
-use RequestContext;
+use MediaWiki\Context\RequestContext;
 
 /**
  * Stub object for the user language. Assigned to the $wgLang global.

includes/WebStart.php

@@ -25,11 +25,12 @@
  * @file
  */
 
+use MediaWiki\Context\RequestContext;
+use MediaWiki\Settings\SettingsBuilder;
+
 # T17461: Make IE8 turn off content sniffing. Everybody else should ignore this
 # We're adding it here so that it's *always* set, even for alternate entry
 # points and when $wgOut gets disabled or overridden.
-use MediaWiki\Settings\SettingsBuilder;
-
 header( 'X-Content-Type-Options: nosniff' );
 
 # Valid web server entry point, enable includes.

includes/actions/Action.php

@@ -19,6 +19,7 @@
  * @file
  */
 
+use MediaWiki\Context\IContextSource;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Language\RawMessage;

includes/actions/ActionEntryPoint.php

@@ -8,6 +8,7 @@ use BadTitleError;
 use ErrorPageError;
 use HTMLFileCache;
 use HttpError;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiEntryPoint;
@@ -24,7 +25,6 @@ use MediaWiki\User\User;
 use MWExceptionRenderer;
 use PermissionsError;
 use Profiler;
-use RequestContext;
 use Throwable;
 use UnexpectedValueException;
 use ViewAction;

includes/actions/ActionFactory.php

@@ -22,18 +22,18 @@ namespace MediaWiki\Actions;
 use Action;
 use Article;
 use CreditsAction;
-use IContextSource;
 use InfoAction;
 use MarkpatrolledAction;
 use McrRestoreAction;
 use McrUndoAction;
+use MediaWiki\Context\IContextSource;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Title\Title;
 use Psr\Log\LoggerInterface;
 use RawAction;
-use RequestContext;
 use RevertAction;
 use RollbackAction;
 use UnwatchAction;

includes/actions/CreditsAction.php

@@ -23,6 +23,7 @@
  * @author <evan@wikitravel.org>
  */
 
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Html\Html;
 use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;

includes/actions/DeleteAction.php

@@ -20,6 +20,7 @@
 
 use MediaWiki\Cache\BacklinkCacheFactory;
 use MediaWiki\CommentStore\CommentStore;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Html\Html;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\MainConfigNames;

includes/actions/FileDeleteAction.php

@@ -24,8 +24,8 @@ use Article;
 use DeleteAction;
 use ErrorPageError;
 use File;
-use IContextSource;
 use LocalFile;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\File\FileDeleteForm;

includes/actions/Hook/GetActionNameHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Actions\Hook;
 
-use IContextSource;
+use MediaWiki\Context\IContextSource;
 
 /**
  * @stable to implement

includes/actions/Hook/HistoryPageToolLinksHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use IContextSource;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Linker\LinkRenderer;
 
 /**

includes/actions/Hook/InfoActionHook.php

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

includes/actions/Hook/PageHistoryBeforeListHook.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Hook;
 
 use Article;
-use IContextSource;
+use MediaWiki\Context\IContextSource;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/actions/InfoAction.php

@@ -24,6 +24,7 @@
 
 use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\Category\Category;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\EditPage\TemplatesOnThisPageFormatter;
 use MediaWiki\Html\Html;
 use MediaWiki\Languages\LanguageNameUtils;

includes/actions/MarkpatrolledAction.php

@@ -20,6 +20,7 @@
  * @ingroup Actions
  */
 
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\SpecialPage\SpecialPage;
 

includes/actions/McrUndoAction.php

@@ -9,6 +9,7 @@ use MediaWiki\CommentFormatter\CommentFormatter;
 use MediaWiki\CommentStore\CommentStore;
 use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Config\Config;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Html\Html;
 use MediaWiki\Linker\Linker;
 use MediaWiki\MainConfigNames;

includes/actions/RawAction.php

@@ -26,6 +26,7 @@
  * @file
  */
 
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Permissions\PermissionManager;

includes/actions/RevertAction.php

@@ -23,6 +23,7 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
+use MediaWiki\Context\IContextSource;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Output\OutputPage;
 use MediaWiki\Status\Status;

includes/actions/RollbackAction.php

@@ -23,6 +23,7 @@
 use MediaWiki\CommentFormatter\CommentFormatter;
 use MediaWiki\Config\ConfigException;
 use MediaWiki\Content\IContentHandlerFactory;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Linker\Linker;
 use MediaWiki\MainConfigNames;

includes/actions/UnwatchAction.php

@@ -20,6 +20,7 @@
  * @ingroup Actions
  */
 
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Watchlist\WatchlistManager;
 
 /**

includes/actions/WatchAction.php

@@ -20,6 +20,7 @@
  * @ingroup Actions
  */
 
+use MediaWiki\Context\IContextSource;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Status\Status;
 use MediaWiki\User\User;

includes/api/ApiBase.php

@@ -23,6 +23,8 @@
 use MediaWiki\Api\ApiHookRunner;
 use MediaWiki\Api\Validator\SubmoduleDef;
 use MediaWiki\Block\Block;
+use MediaWiki\Context\ContextSource;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Language\RawMessage;
 use MediaWiki\MainConfigNames;

includes/api/ApiEditPage.php

@@ -21,6 +21,7 @@
  */
 
 use MediaWiki\Content\IContentHandlerFactory;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\EditPage\EditPage;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;

includes/api/ApiEntryPoint.php

@@ -29,6 +29,7 @@ namespace MediaWiki\Api;
 
 use ApiMain;
 use LogicException;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\EntryPointEnvironment;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Logger\LegacyLogger;
@@ -36,7 +37,6 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiEntryPoint;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Title\Title;
-use RequestContext;
 use Throwable;
 
 /**

includes/api/ApiHelp.php

@@ -20,6 +20,8 @@
  * @file
  */
 
+use MediaWiki\Context\DerivativeContext;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Html\Html;
 use MediaWiki\Html\HtmlHelper;
 use MediaWiki\Linker\Linker;

includes/api/ApiMain.php

@@ -22,6 +22,9 @@
  */
 
 use MediaWiki\Api\Validator\ApiParamValidator;
+use MediaWiki\Context\DerivativeContext;
+use MediaWiki\Context\IContextSource;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Html\Html;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;

includes/api/ApiModuleManager.php

@@ -21,6 +21,7 @@
  * @since 1.21
  */
 
+use MediaWiki\Context\ContextSource;
 use MediaWiki\MediaWikiServices;
 use Wikimedia\ObjectFactory\ObjectFactory;
 

includes/api/ApiParamInfo.php

@@ -20,6 +20,7 @@
  * @file
  */
 
+use MediaWiki\Context\RequestContext;
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\User\UserFactory;
 use MediaWiki\Utils\ExtensionInfo;

includes/api/Hook/ApiFeedContributions__feedItemHook.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Api\Hook;
 
 // phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps
-use IContextSource;
+use MediaWiki\Context\IContextSource;
 use stdClass;
 
 /**

includes/api/Hook/ApiFormatHighlightHook.php

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

includes/api/SearchApi.php

@@ -20,6 +20,7 @@
  * @since 1.28
  */
 
+use MediaWiki\Context\IContextSource;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\ParamValidator\TypeDef\IntegerDef;
 

includes/auth/AuthManager.php

@@ -27,6 +27,7 @@ use IDBAccessObject;
 use Language;
 use MediaWiki\Block\BlockManager;
 use MediaWiki\Config\Config;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Deferred\SiteStatsUpdate;
 use MediaWiki\HookContainer\HookContainer;
@@ -2324,7 +2325,7 @@ class AuthManager implements LoggerAwareInterface {
 	private function getAuthenticationRequestsInternal(
 		$providerAction, array $options, array $providers, UserIdentity $user = null
 	) {
-		$user = $user ?: \RequestContext::getMain()->getUser();
+		$user = $user ?: RequestContext::getMain()->getUser();
 		$options['username'] = $user->isRegistered() ? $user->getName() : null;
 
 		// Query them and merge results
@@ -2641,7 +2642,7 @@ class AuthManager implements LoggerAwareInterface {
 	private function setDefaultUserOptions( User $user, $useContextLang ) {
 		$user->setToken();
 
-		$lang = $useContextLang ? \RequestContext::getMain()->getLanguage() : $this->contentLanguage;
+		$lang = $useContextLang ? RequestContext::getMain()->getLanguage() : $this->contentLanguage;
 		$this->userOptionsManager->setOption(
 			$user,
 			'language',

includes/block/AbstractBlock.php

@@ -20,9 +20,9 @@
 
 namespace MediaWiki\Block;
 
-use IContextSource;
 use InvalidArgumentException;
 use MediaWiki\CommentStore\CommentStoreComment;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\DAO\WikiAwareEntityTrait;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;

includes/cache/GenderCache.php

@@ -19,6 +19,7 @@
  * @author Niklas Laxström
  */
 
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Title\NamespaceInfo;

includes/cache/HTMLFileCache.php

@@ -22,6 +22,7 @@
  */
 
 use MediaWiki\Cache\CacheKeyHelper;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;

includes/cache/Hook/HTMLFileCache__useFileCacheHook.php

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

includes/changes/ChangesList.php

@@ -23,6 +23,9 @@
  */
 
 use MediaWiki\CommentFormatter\RowCommentFormatter;
+use MediaWiki\Context\ContextSource;
+use MediaWiki\Context\IContextSource;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\HookContainer\ProtectedHookAccessorTrait;
 use MediaWiki\Html\Html;

includes/changes/ChangesListFilter.php

@@ -21,6 +21,7 @@
  * @author Matthew Flaschen
  */
 
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Html\FormOptions;
 
 /**

includes/changes/EnhancedChangesList.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Html\Html;
 use MediaWiki\Html\TemplateParser;
 use MediaWiki\MainConfigNames;

includes/changes/RCCacheEntryFactory.php

@@ -20,6 +20,7 @@
  * @file
  */
 
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Revision\RevisionRecord;

includes/changetags/ChangeTags.php

@@ -21,6 +21,8 @@
  * @ingroup Change tagging
  */
 
+use MediaWiki\Context\IContextSource;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Html\Html;
 use MediaWiki\Language\RawMessage;

includes/changetags/ChangeTagsList.php

@@ -19,6 +19,7 @@
  * @ingroup Change tagging
  */
 
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Status\Status;

includes/content/ContentHandler.php

@@ -31,6 +31,8 @@ use MediaWiki\Content\Renderer\ContentParseParams;
 use MediaWiki\Content\Transform\PreloadTransformParams;
 use MediaWiki\Content\Transform\PreSaveTransformParams;
 use MediaWiki\Content\ValidationParams;
+use MediaWiki\Context\IContextSource;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Deferred\DeferrableUpdate;
 use MediaWiki\Diff\TextDiffer\ManifoldTextDiffer;
 use MediaWiki\HookContainer\HookRunner;

includes/content/ContentModelChange.php

@@ -1,6 +1,9 @@
 <?php
 
 use MediaWiki\Content\IContentHandlerFactory;
+use MediaWiki\Context\DerivativeContext;
+use MediaWiki\Context\IContextSource;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Page\PageIdentity;

includes/content/FallbackContentHandler.php

@@ -24,6 +24,7 @@
  */
 
 use MediaWiki\Content\Renderer\ContentParseParams;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Html\Html;
 use MediaWiki\Parser\ParserOutput;
 

includes/content/Hook/GetDifferenceEngineHook.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Content\Hook;
 
 use DifferenceEngine;
-use IContextSource;
+use MediaWiki\Context\IContextSource;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/content/Hook/GetSlotDiffRendererHook.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Content\Hook;
 
 use ContentHandler;
-use IContextSource;
+use MediaWiki\Context\IContextSource;
 use SlotDiffRenderer;
 
 /**

includes/content/WikitextContent.php

@@ -25,6 +25,7 @@
  * @author Daniel Kinzler
  */
 
+use MediaWiki\Context\RequestContext;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;

includes/context/ContextSource.php

@@ -18,6 +18,9 @@
  * @file
  */
 
+namespace MediaWiki\Context;
+
+use Language;
 use MediaWiki\Config\Config;
 use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\Authority;
@@ -25,8 +28,13 @@ use MediaWiki\Request\WebRequest;
 use MediaWiki\Session\CsrfTokenSet;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
+use Message;
+use MessageSpecifier;
+use Skin;
+use Timing;
 use Wikimedia\Bcp47Code\Bcp47Code;
 use Wikimedia\NonSerializable\NonSerializableTrait;
+use WikiPage;
 
 /**
  * The simplest way of implementing IContextSource is to hold a RequestContext as a
@@ -236,3 +244,6 @@ abstract class ContextSource implements IContextSource {
 		return $this->getContext()->getCsrfTokenSet();
 	}
 }
+
+/** @deprecated since 1.42 */
+class_alias( ContextSource::class, 'ContextSource' );

includes/context/DerivativeContext.php

@@ -19,6 +19,9 @@
  * @file
  */
 
+namespace MediaWiki\Context;
+
+use Language;
 use MediaWiki\Config\Config;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Output\OutputPage;
@@ -26,7 +29,12 @@ use MediaWiki\Permissions\Authority;
 use MediaWiki\Request\WebRequest;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
+use Message;
+use MessageSpecifier;
+use Skin;
+use Timing;
 use Wikimedia\Assert\Assert;
+use WikiPage;
 
 /**
  * An IContextSource implementation which will inherit context from another source
@@ -330,3 +338,6 @@ class DerivativeContext extends ContextSource implements MutableContext {
 		return wfMessage( $key, ...$params )->setContext( $this );
 	}
 }
+
+/** @deprecated since 1.42 */
+class_alias( DerivativeContext::class, 'DerivativeContext' );

includes/context/Hook/RequestContextCreateSkinHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use IContextSource;
+use MediaWiki\Context\IContextSource;
 use Skin;
 
 /**

includes/context/Hook/UserGetLanguageObjectHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use IContextSource;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\User\User;
 
 /**

includes/context/IContextSource.php

@@ -18,6 +18,8 @@
  * @file
  */
 
+namespace MediaWiki\Context;
+
 use MediaWiki\Config\Config;
 use MediaWiki\Language\LocalizationContext;
 use MediaWiki\Output\OutputPage;
@@ -26,6 +28,9 @@ use MediaWiki\Request\WebRequest;
 use MediaWiki\Session\CsrfTokenSetProvider;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
+use Skin;
+use Timing;
+use WikiPage;
 
 /**
  * Interface for objects which can provide a MediaWiki context on request
@@ -156,3 +161,6 @@ interface IContextSource extends LocalizationContext, CsrfTokenSetProvider {
 	 */
 	public function exportSession();
 }
+
+/** @deprecated since 1.42 */
+class_alias( IContextSource::class, 'IContextSource' );

includes/context/MutableContext.php

@@ -18,12 +18,17 @@
  * @file
  */
 
+namespace MediaWiki\Context;
+
+use Language;
 use MediaWiki\Config\Config;
 use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Request\WebRequest;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
+use Skin;
+use WikiPage;
 
 /**
  * Request-dependent objects containers.
@@ -85,3 +90,6 @@ interface MutableContext {
 	public function setSkin( Skin $skin );
 
 }
+
+/** @deprecated since 1.42 */
+class_alias( MutableContext::class, 'MutableContext' );

includes/context/RequestContext.php

@@ -22,6 +22,13 @@
  * @file
  */
 
+namespace MediaWiki\Context;
+
+use BadMethodCallException;
+use Exception;
+use InvalidArgumentException;
+use Language;
+use LogicException;
 use MediaWiki\Config\Config;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Logger\LoggerFactory;
@@ -32,15 +39,22 @@ use MediaWiki\Permissions\Authority;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Request\WebRequest;
 use MediaWiki\Session\CsrfTokenSet;
+use MediaWiki\Session\PHPSessionHandler;
+use MediaWiki\Session\SessionManager;
 use MediaWiki\StubObject\StubGlobalUser;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
+use Message;
+use MessageSpecifier;
+use Skin;
+use Timing;
 use Wikimedia\Assert\Assert;
 use Wikimedia\AtEase\AtEase;
 use Wikimedia\Bcp47Code\Bcp47Code;
 use Wikimedia\IPUtils;
 use Wikimedia\NonSerializable\NonSerializableTrait;
 use Wikimedia\ScopedCallback;
+use WikiPage;
 
 /**
  * Group all the pieces relevant to the context of a request into one instance
@@ -638,7 +652,7 @@ class RequestContext implements IContextSource, MutableContext {
 	 * @since 1.21
 	 */
 	public function exportSession() {
-		$session = MediaWiki\Session\SessionManager::getGlobalSession();
+		$session = SessionManager::getGlobalSession();
 		return [
 			'ip' => $this->getRequest()->getIP(),
 			'headers' => $this->getRequest()->getAllHeaders(),
@@ -672,7 +686,7 @@ class RequestContext implements IContextSource, MutableContext {
 	 */
 	public static function importScopedSession( array $params ) {
 		if ( strlen( $params['sessionId'] ) &&
-			MediaWiki\Session\SessionManager::getGlobalSession()->isPersistent()
+			SessionManager::getGlobalSession()->isPersistent()
 		) {
 			// Check to avoid sending random cookies for the wrong users.
 			// This method should only called by CLI scripts or by HTTP job runners.
@@ -697,7 +711,7 @@ class RequestContext implements IContextSource, MutableContext {
 			$context = RequestContext::getMain();
 
 			// Commit and close any current session
-			if ( MediaWiki\Session\PHPSessionHandler::isEnabled() ) {
+			if ( PHPSessionHandler::isEnabled() ) {
 				session_write_close(); // persist
 				session_id( '' ); // detach
 				$_SESSION = []; // clear in-memory array
@@ -706,7 +720,7 @@ class RequestContext implements IContextSource, MutableContext {
 			// Get new session, if applicable
 			$session = null;
 			if ( strlen( $params['sessionId'] ) ) { // don't make a new random ID
-				$manager = MediaWiki\Session\SessionManager::singleton();
+				$manager = SessionManager::singleton();
 				$session = $manager->getSessionById( $params['sessionId'], true )
 					?: $manager->getEmptySession();
 			}
@@ -722,7 +736,7 @@ class RequestContext implements IContextSource, MutableContext {
 			// of the User object being attached to the wrong IP, headers, or session.
 			$context->setUser( $user );
 			StubGlobalUser::setUser( $context->getUser() ); // b/c
-			if ( $session && MediaWiki\Session\PHPSessionHandler::isEnabled() ) {
+			if ( $session && PHPSessionHandler::isEnabled() ) {
 				session_id( $session->getId() );
 				AtEase::quietCall( 'session_start' );
 			}
@@ -789,3 +803,6 @@ class RequestContext implements IContextSource, MutableContext {
 	}
 
 }
+
+/** @deprecated since 1.42 */
+class_alias( RequestContext::class, 'RequestContext' );

includes/debug/MWDebug.php

@@ -18,6 +18,7 @@
  * @file
  */
 
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Html\Html;
 use MediaWiki\Logger\LegacyLogger;
 use MediaWiki\Output\OutputPage;

includes/diff/DifferenceEngine.php

@@ -23,6 +23,8 @@
 
 use MediaWiki\CommentFormatter\CommentFormatter;
 use MediaWiki\Content\IContentHandlerFactory;
+use MediaWiki\Context\ContextSource;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Diff\TextDiffer\ManifoldTextDiffer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Html\Html;

includes/diff/Hook/TextSlotDiffRendererTablePrefixHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Diff\Hook;
 
-use IContextSource;
+use MediaWiki\Context\IContextSource;
 use TextSlotDiffRenderer;
 
 /**

includes/diff/SlotDiffRenderer.php

@@ -21,6 +21,7 @@
  * @ingroup DifferenceEngine
  */
 
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Output\OutputPage;
 use MediaWiki\Title\Title;
 use Wikimedia\Assert\Assert;

includes/diff/TextSlotDiffRenderer.php

@@ -21,6 +21,8 @@
  * @ingroup DifferenceEngine
  */
 
+use MediaWiki\Context\IContextSource;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Diff\TextDiffer\ManifoldTextDiffer;
 use MediaWiki\Diff\TextDiffer\TextDiffer;
 use MediaWiki\HookContainer\HookContainer;

includes/editpage/Constraint/EditConstraintFactory.php

@@ -21,9 +21,9 @@
 namespace MediaWiki\EditPage\Constraint;
 
 use Content;
-use IContextSource;
 use Language;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\EditPage\SpamChecker;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Linker\LinkTarget;

includes/editpage/Constraint/EditFilterMergedContentHookConstraint.php

@@ -22,8 +22,8 @@ namespace MediaWiki\EditPage\Constraint;
 
 use ApiMessage;
 use Content;
-use IContextSource;
 use Language;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Html\Html;

includes/editpage/EditPage.php

@@ -26,9 +26,7 @@ use CategoryPage;
 use Content;
 use ContentHandler;
 use DeprecationHelper;
-use DerivativeContext;
 use ErrorPageError;
-use IContextSource;
 use IDBAccessObject;
 use LogPage;
 use ManualLogEntry;
@@ -38,6 +36,8 @@ use MediaWiki\CommentStore\CommentStore;
 use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Config\Config;
 use MediaWiki\Content\IContentHandlerFactory;
+use MediaWiki\Context\DerivativeContext;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\EditPage\Constraint\AccidentalRecreationConstraint;
 use MediaWiki\EditPage\Constraint\AutoSummaryMissingSummaryConstraint;

includes/editpage/ParametersHelper.php

@@ -2,12 +2,12 @@
 
 namespace MediaWiki\EditPage;
 
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\SpecialPage\SpecialPageFactory;
 use MediaWiki\Specials\SpecialMyLanguage;
 use MediaWiki\Title\Title;
-use RequestContext;
 
 /**
  * Helper methods for resolving EditPage parameters that deal with page titles.

includes/editpage/TemplatesOnThisPageFormatter.php

@@ -20,8 +20,8 @@
 
 namespace MediaWiki\EditPage;
 
-use IContextSource;
 use MediaWiki\Cache\LinkBatchFactory;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Html\Html;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Page\PageIdentity;

includes/exception/MWExceptionRenderer.php

@@ -18,6 +18,7 @@
  * @file
  */
 
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Html\Html;
 use MediaWiki\Language\RawMessage;
 use MediaWiki\MainConfigNames;

includes/exception/PermissionsError.php

@@ -18,6 +18,7 @@
  * @file
  */
 
+use MediaWiki\Context\RequestContext;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Permissions\PermissionStatus;
 use MediaWiki\User\UserGroupMembership;

includes/exception/UserBlockedError.php

@@ -19,6 +19,7 @@
  */
 
 use MediaWiki\Block\Block;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Language\RawMessage;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\User\UserIdentity;

includes/exception/UserNotLoggedIn.php

@@ -18,6 +18,7 @@
  * @file
  */
 
+use MediaWiki\Context\RequestContext;
 use MediaWiki\SpecialPage\SpecialPage;
 
 /**

includes/filerepo/FileRepo.php

@@ -7,6 +7,7 @@
  * @details
  */
 
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;

includes/filerepo/LocalRepo.php

@@ -18,6 +18,7 @@
  * @file
  */
 
+use MediaWiki\Context\RequestContext;
 use MediaWiki\FileRepo\File\FileSelectQueryBuilder;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MediaWikiServices;

includes/filerepo/file/File.php

@@ -7,6 +7,7 @@
  */
 
 use MediaWiki\Config\ConfigException;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\HookContainer\ProtectedHookAccessorTrait;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;

includes/filerepo/file/LocalFile.php

@@ -19,6 +19,7 @@
  */
 
 use MediaWiki\CommentStore\CommentStoreComment;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Deferred\AutoCommitUpdate;
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Deferred\LinksUpdate\LinksUpdate;

includes/gallery/ImageGalleryBase.php

@@ -20,6 +20,9 @@
  * @file
  */
 
+use MediaWiki\Context\ContextSource;
+use MediaWiki\Context\IContextSource;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;

includes/gallery/PackedImageGallery.php

@@ -20,6 +20,8 @@
  * @file
  */
 
+use MediaWiki\Context\IContextSource;
+
 class PackedImageGallery extends TraditionalImageGallery {
 	public function __construct( $mode = 'traditional', IContextSource $context = null ) {
 		parent::__construct( $mode, $context );

includes/gallery/SlideshowImageGallery.php

@@ -20,6 +20,8 @@
  * @file
  */
 
+use MediaWiki\Context\IContextSource;
+
 class SlideshowImageGallery extends TraditionalImageGallery {
 	public function __construct( $mode = 'traditional', IContextSource $context = null ) {
 		parent::__construct( $mode, $context );