diff options
299 files changed, 450 insertions, 153 deletions
diff --git a/RELEASE-NOTES-1.42 b/RELEASE-NOTES-1.42 index f859a55faacf..d63cc20f2bc7 100644 --- a/RELEASE-NOTES-1.42 +++ b/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 @@ -26,6 +26,7 @@ */ use MediaWiki\Api\ApiEntryPoint; +use MediaWiki\Context\RequestContext; use MediaWiki\EntryPointEnvironment; use MediaWiki\MediaWikiServices; diff --git a/autoload.php b/autoload.php index 0d57e0c6dbaf..cde0f3bdbe49 100644 --- a/autoload.php +++ b/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', diff --git a/img_auth.php b/img_auth.php index e0d25c0806e1..edc27c7ce1e6 100644 --- a/img_auth.php +++ b/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; diff --git a/includes/Category/CategoryViewer.php b/includes/Category/CategoryViewer.php index 32d06cdf65aa..abcdec63570b 100644 --- a/includes/Category/CategoryViewer.php +++ b/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; diff --git a/includes/Feed/FeedUtils.php b/includes/Feed/FeedUtils.php index 574331152e59..cc677f66917d 100644 --- a/includes/Feed/FeedUtils.php +++ b/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; diff --git a/includes/Hook/EditFilterMergedContentHook.php b/includes/Hook/EditFilterMergedContentHook.php index a3ad70c6302e..c8336cc532d5 100644 --- a/includes/Hook/EditFilterMergedContentHook.php +++ b/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; diff --git a/includes/HookContainer/HookRunner.php b/includes/HookContainer/HookRunner.php index c86e9b524840..85bd33bab662 100644 --- a/includes/HookContainer/HookRunner.php +++ b/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; diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php index 4fe5d48fa53d..0cea396a9ea7 100644 --- a/includes/MediaWiki.php +++ b/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; diff --git a/includes/MediaWikiEntryPoint.php b/includes/MediaWikiEntryPoint.php index 5259f0b843d2..88ee4fe42e3e 100644 --- a/includes/MediaWikiEntryPoint.php +++ b/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; diff --git a/includes/Output/IframeSandbox.php b/includes/Output/IframeSandbox.php index fd00d2a5678a..1080f56041f0 100644 --- a/includes/Output/IframeSandbox.php +++ b/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; diff --git a/includes/Output/IframeSandboxFactory.php b/includes/Output/IframeSandboxFactory.php index e001bf8be08b..eb69946c55c1 100644 --- a/includes/Output/IframeSandboxFactory.php +++ b/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; /** diff --git a/includes/Output/OutputPage.php b/includes/Output/OutputPage.php index e82191fcaaf4..33243e1ae94a 100644 --- a/includes/Output/OutputPage.php +++ b/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; diff --git a/includes/OutputTransform/Stages/HandleSectionLinks.php b/includes/OutputTransform/Stages/HandleSectionLinks.php index e0d5e843fbd1..b3f9867e9cba 100644 --- a/includes/OutputTransform/Stages/HandleSectionLinks.php +++ b/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; /** diff --git a/includes/OutputTransform/Stages/HandleTOCMarkers.php b/includes/OutputTransform/Stages/HandleTOCMarkers.php index 8840517f626a..4eecd2fa2101 100644 --- a/includes/OutputTransform/Stages/HandleTOCMarkers.php +++ b/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) diff --git a/includes/Permissions/PermissionManager.php b/includes/Permissions/PermissionManager.php index 91770635b239..f28a6be87682 100644 --- a/includes/Permissions/PermissionManager.php +++ b/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; diff --git a/includes/Permissions/UserAuthority.php b/includes/Permissions/UserAuthority.php index 216811e1ea02..935c2096df66 100644 --- a/includes/Permissions/UserAuthority.php +++ b/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; diff --git a/includes/Rest/EntryPoint.php b/includes/Rest/EntryPoint.php index 7519e49110e5..aecae45e26ed 100644 --- a/includes/Rest/EntryPoint.php +++ b/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 { diff --git a/includes/Rest/Handler/ActionModuleBasedHandler.php b/includes/Rest/Handler/ActionModuleBasedHandler.php index 1829f59793d2..205a40c88d64 100644 --- a/includes/Rest/Handler/ActionModuleBasedHandler.php +++ b/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; diff --git a/includes/Rest/Handler/ParsoidHandler.php b/includes/Rest/Handler/ParsoidHandler.php index 04def31c74e4..570aa9011f35 100644 --- a/includes/Rest/Handler/ParsoidHandler.php +++ b/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 ) { diff --git a/includes/Rest/Handler/SearchHandler.php b/includes/Rest/Handler/SearchHandler.php index 899ede950bcc..0a068dddf1fe 100644 --- a/includes/Rest/Handler/SearchHandler.php +++ b/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; diff --git a/includes/Revision/ContributionsLookup.php b/includes/Revision/ContributionsLookup.php index ffebb8c94a05..3f4bb5aa2b31 100644 --- a/includes/Revision/ContributionsLookup.php +++ b/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; /** diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php index f7b426db3d0d..0e2652e5d870 100644 --- a/includes/ServiceWiring.php +++ b/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; diff --git a/includes/Setup.php b/includes/Setup.php index 250a500fcf69..913ad3418141 100644 --- a/includes/Setup.php +++ b/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; diff --git a/includes/Status/Status.php b/includes/Status/Status.php index 074e8a0ba2e1..5a26b6f008ee 100644 --- a/includes/Status/Status.php +++ b/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; diff --git a/includes/StubObject/StubUserLang.php b/includes/StubObject/StubUserLang.php index 611ddcc53690..8fb018d84c5a 100644 --- a/includes/StubObject/StubUserLang.php +++ b/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. diff --git a/includes/WebStart.php b/includes/WebStart.php index df3423a56b8d..b822f5d95b30 100644 --- a/includes/WebStart.php +++ b/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. diff --git a/includes/actions/Action.php b/includes/actions/Action.php index 211879248a69..3729dbfb85f5 100644 --- a/includes/actions/Action.php +++ b/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; diff --git a/includes/actions/ActionEntryPoint.php b/includes/actions/ActionEntryPoint.php index 6cff3bff3ba9..91a3382c4f27 100644 --- a/includes/actions/ActionEntryPoint.php +++ b/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; diff --git a/includes/actions/ActionFactory.php b/includes/actions/ActionFactory.php index 4e6d525d4e5f..0e07c6464c6d 100644 --- a/includes/actions/ActionFactory.php +++ b/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; diff --git a/includes/actions/CreditsAction.php b/includes/actions/CreditsAction.php index ec88d133a616..058d5d2b0df4 100644 --- a/includes/actions/CreditsAction.php +++ b/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; diff --git a/includes/actions/DeleteAction.php b/includes/actions/DeleteAction.php index 1c1b615cd3c8..408cb2c40850 100644 --- a/includes/actions/DeleteAction.php +++ b/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; diff --git a/includes/actions/FileDeleteAction.php b/includes/actions/FileDeleteAction.php index d801b9c78096..eb302fbb7f2e 100644 --- a/includes/actions/FileDeleteAction.php +++ b/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; diff --git a/includes/actions/Hook/GetActionNameHook.php b/includes/actions/Hook/GetActionNameHook.php index 2fd3c6f01821..e3c93b9d2220 100644 --- a/includes/actions/Hook/GetActionNameHook.php +++ b/includes/actions/Hook/GetActionNameHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Actions\Hook; -use IContextSource; +use MediaWiki\Context\IContextSource; /** * @stable to implement diff --git a/includes/actions/Hook/HistoryPageToolLinksHook.php b/includes/actions/Hook/HistoryPageToolLinksHook.php index dcd4bc90f1d4..3622c795425a 100644 --- a/includes/actions/Hook/HistoryPageToolLinksHook.php +++ b/includes/actions/Hook/HistoryPageToolLinksHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Hook; -use IContextSource; +use MediaWiki\Context\IContextSource; use MediaWiki\Linker\LinkRenderer; /** diff --git a/includes/actions/Hook/InfoActionHook.php b/includes/actions/Hook/InfoActionHook.php index 47d92ce28e72..0b669f770547 100644 --- a/includes/actions/Hook/InfoActionHook.php +++ b/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. diff --git a/includes/actions/Hook/PageHistoryBeforeListHook.php b/includes/actions/Hook/PageHistoryBeforeListHook.php index 8e5832d0c777..bd287aab7bcb 100644 --- a/includes/actions/Hook/PageHistoryBeforeListHook.php +++ b/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. diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php index 7f96dd7bef4d..615bfcca2bd5 100644 --- a/includes/actions/InfoAction.php +++ b/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; diff --git a/includes/actions/MarkpatrolledAction.php b/includes/actions/MarkpatrolledAction.php index 097adfe80fa9..b444f9fe1dc2 100644 --- a/includes/actions/MarkpatrolledAction.php +++ b/includes/actions/MarkpatrolledAction.php @@ -20,6 +20,7 @@ * @ingroup Actions */ +use MediaWiki\Context\IContextSource; use MediaWiki\Linker\LinkRenderer; use MediaWiki\SpecialPage\SpecialPage; diff --git a/includes/actions/McrUndoAction.php b/includes/actions/McrUndoAction.php index 480ae5aa826a..e79fd7243b74 100644 --- a/includes/actions/McrUndoAction.php +++ b/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; diff --git a/includes/actions/RawAction.php b/includes/actions/RawAction.php index c4ff4fdd0f01..fa8dfe9361ae 100644 --- a/includes/actions/RawAction.php +++ b/includes/actions/RawAction.php @@ -26,6 +26,7 @@ * @file */ +use MediaWiki\Context\IContextSource; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; use MediaWiki\Permissions\PermissionManager; diff --git a/includes/actions/RevertAction.php b/includes/actions/RevertAction.php index 94806f2c0f29..a327c745ae6c 100644 --- a/includes/actions/RevertAction.php +++ b/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; diff --git a/includes/actions/RollbackAction.php b/includes/actions/RollbackAction.php index a3c1a3513db0..3de00ebb5089 100644 --- a/includes/actions/RollbackAction.php +++ b/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; diff --git a/includes/actions/UnwatchAction.php b/includes/actions/UnwatchAction.php index d04f8e287f69..7cadf4b04b24 100644 --- a/includes/actions/UnwatchAction.php +++ b/includes/actions/UnwatchAction.php @@ -20,6 +20,7 @@ * @ingroup Actions */ +use MediaWiki\Context\IContextSource; use MediaWiki\Watchlist\WatchlistManager; /** diff --git a/includes/actions/WatchAction.php b/includes/actions/WatchAction.php index 0858761927cf..2395add8987b 100644 --- a/includes/actions/WatchAction.php +++ b/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; diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php index be747d195d86..3977e651c67b 100644 --- a/includes/api/ApiBase.php +++ b/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; diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php index 6141de657498..aa801f0558b4 100644 --- a/includes/api/ApiEditPage.php +++ b/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; diff --git a/includes/api/ApiEntryPoint.php b/includes/api/ApiEntryPoint.php index 046b113d705a..6de25939914f 100644 --- a/includes/api/ApiEntryPoint.php +++ b/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; /** diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php index e2bbcc2bca3f..289ddc1ff8fc 100644 --- a/includes/api/ApiHelp.php +++ b/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; diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index b9e46471528a..dfa2254ab29b 100644 --- a/includes/api/ApiMain.php +++ b/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; diff --git a/includes/api/ApiModuleManager.php b/includes/api/ApiModuleManager.php index 5c6b327dc997..dff15298add7 100644 --- a/includes/api/ApiModuleManager.php +++ b/includes/api/ApiModuleManager.php @@ -21,6 +21,7 @@ * @since 1.21 */ +use MediaWiki\Context\ContextSource; use MediaWiki\MediaWikiServices; use Wikimedia\ObjectFactory\ObjectFactory; diff --git a/includes/api/ApiParamInfo.php b/includes/api/ApiParamInfo.php index 9d6587128f57..3f9f60c66e89 100644 --- a/includes/api/ApiParamInfo.php +++ b/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; diff --git a/includes/api/Hook/ApiFeedContributions__feedItemHook.php b/includes/api/Hook/ApiFeedContributions__feedItemHook.php index b398c0b89c65..862068fac082 100644 --- a/includes/api/Hook/ApiFeedContributions__feedItemHook.php +++ b/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; /** diff --git a/includes/api/Hook/ApiFormatHighlightHook.php b/includes/api/Hook/ApiFormatHighlightHook.php index 5f18bcfde0ed..a14e232c2982 100644 --- a/includes/api/Hook/ApiFormatHighlightHook.php +++ b/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. diff --git a/includes/api/SearchApi.php b/includes/api/SearchApi.php index aae48fdc9449..e8190c7e941c 100644 --- a/includes/api/SearchApi.php +++ b/includes/api/SearchApi.php @@ -20,6 +20,7 @@ * @since 1.28 */ +use MediaWiki\Context\IContextSource; use Wikimedia\ParamValidator\ParamValidator; use Wikimedia\ParamValidator\TypeDef\IntegerDef; diff --git a/includes/auth/AuthManager.php b/includes/auth/AuthManager.php index 88a764065945..3c89cf0181dc 100644 --- a/includes/auth/AuthManager.php +++ b/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', diff --git a/includes/block/AbstractBlock.php b/includes/block/AbstractBlock.php index 0bfd58b1b337..52f829888683 100644 --- a/includes/block/AbstractBlock.php +++ b/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; diff --git a/includes/cache/GenderCache.php b/includes/cache/GenderCache.php index 43b42dd074dc..b098cba1712b 100644 --- a/includes/cache/GenderCache.php +++ b/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; diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php index c1c618435130..afa5cf498c01 100644 --- a/includes/cache/HTMLFileCache.php +++ b/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; diff --git a/includes/cache/Hook/HTMLFileCache__useFileCacheHook.php b/includes/cache/Hook/HTMLFileCache__useFileCacheHook.php index 8155ea404585..e2d17ab50b0b 100644 --- a/includes/cache/Hook/HTMLFileCache__useFileCacheHook.php +++ b/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. diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php index f9aecf0ef82d..4792f029d626 100644 --- a/includes/changes/ChangesList.php +++ b/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; diff --git a/includes/changes/ChangesListFilter.php b/includes/changes/ChangesListFilter.php index 6d0d59adacc4..44e70bc4c7f7 100644 --- a/includes/changes/ChangesListFilter.php +++ b/includes/changes/ChangesListFilter.php @@ -21,6 +21,7 @@ * @author Matthew Flaschen */ +use MediaWiki\Context\IContextSource; use MediaWiki\Html\FormOptions; /** diff --git a/includes/changes/EnhancedChangesList.php b/includes/changes/EnhancedChangesList.php index b0d481e68fa1..88c1e80d1aa9 100644 --- a/includes/changes/EnhancedChangesList.php +++ b/includes/changes/EnhancedChangesList.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\IContextSource; use MediaWiki\Html\Html; use MediaWiki\Html\TemplateParser; use MediaWiki\MainConfigNames; diff --git a/includes/changes/RCCacheEntryFactory.php b/includes/changes/RCCacheEntryFactory.php index 4801fb403c76..371f20416a29 100644 --- a/includes/changes/RCCacheEntryFactory.php +++ b/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; diff --git a/includes/changetags/ChangeTags.php b/includes/changetags/ChangeTags.php index dfa5b9996c03..a46db2c3540a 100644 --- a/includes/changetags/ChangeTags.php +++ b/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; diff --git a/includes/changetags/ChangeTagsList.php b/includes/changetags/ChangeTagsList.php index 09b9192ea785..5da0dd423c56 100644 --- a/includes/changetags/ChangeTagsList.php +++ b/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; diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php index 36108ea74c44..f9796c2c85f6 100644 --- a/includes/content/ContentHandler.php +++ b/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; diff --git a/includes/content/ContentModelChange.php b/includes/content/ContentModelChange.php index 02e4b8f06505..368cea26dfee 100644 --- a/includes/content/ContentModelChange.php +++ b/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; diff --git a/includes/content/FallbackContentHandler.php b/includes/content/FallbackContentHandler.php index 9eb5fbcadb2d..09149a87aba6 100644 --- a/includes/content/FallbackContentHandler.php +++ b/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; diff --git a/includes/content/Hook/GetDifferenceEngineHook.php b/includes/content/Hook/GetDifferenceEngineHook.php index 80d328393041..f3471fad07c2 100644 --- a/includes/content/Hook/GetDifferenceEngineHook.php +++ b/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. diff --git a/includes/content/Hook/GetSlotDiffRendererHook.php b/includes/content/Hook/GetSlotDiffRendererHook.php index ace6536d8598..35166b55c2b6 100644 --- a/includes/content/Hook/GetSlotDiffRendererHook.php +++ b/includes/content/Hook/GetSlotDiffRendererHook.php @@ -3,7 +3,7 @@ namespace MediaWiki\Content\Hook; use ContentHandler; -use IContextSource; +use MediaWiki\Context\IContextSource; use SlotDiffRenderer; /** diff --git a/includes/content/WikitextContent.php b/includes/content/WikitextContent.php index 41400c1ab9b8..a576cb540a3d 100644 --- a/includes/content/WikitextContent.php +++ b/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; diff --git a/includes/context/ContextSource.php b/includes/context/ContextSource.php index 135150b2c7e3..d03bf52aca1f 100644 --- a/includes/context/ContextSource.php +++ b/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' ); diff --git a/includes/context/DerivativeContext.php b/includes/context/DerivativeContext.php index ce8831956727..573425d73647 100644 --- a/includes/context/DerivativeContext.php +++ b/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' ); diff --git a/includes/context/Hook/RequestContextCreateSkinHook.php b/includes/context/Hook/RequestContextCreateSkinHook.php index b2cea368ede7..defd174fd83c 100644 --- a/includes/context/Hook/RequestContextCreateSkinHook.php +++ b/includes/context/Hook/RequestContextCreateSkinHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Hook; -use IContextSource; +use MediaWiki\Context\IContextSource; use Skin; /** diff --git a/includes/context/Hook/UserGetLanguageObjectHook.php b/includes/context/Hook/UserGetLanguageObjectHook.php index 070192c11de7..f1dd18e994a1 100644 --- a/includes/context/Hook/UserGetLanguageObjectHook.php +++ b/includes/context/Hook/UserGetLanguageObjectHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Hook; -use IContextSource; +use MediaWiki\Context\IContextSource; use MediaWiki\User\User; /** diff --git a/includes/context/IContextSource.php b/includes/context/IContextSource.php index 298b03a8235c..12328ddab2d3 100644 --- a/includes/context/IContextSource.php +++ b/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' ); diff --git a/includes/context/MutableContext.php b/includes/context/MutableContext.php index e95f1129852b..4010a90201a8 100644 --- a/includes/context/MutableContext.php +++ b/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' ); diff --git a/includes/context/RequestContext.php b/includes/context/RequestContext.php index 0645478a605f..96b5d5309221 100644 --- a/includes/context/RequestContext.php +++ b/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' ); diff --git a/includes/debug/MWDebug.php b/includes/debug/MWDebug.php index 3028a40f5300..1c34c74f77b0 100644 --- a/includes/debug/MWDebug.php +++ b/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; diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index cd50cf071325..593e5bfc5e1b 100644 --- a/includes/diff/DifferenceEngine.php +++ b/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; diff --git a/includes/diff/Hook/TextSlotDiffRendererTablePrefixHook.php b/includes/diff/Hook/TextSlotDiffRendererTablePrefixHook.php index 0016a49a488d..07b2988785b7 100644 --- a/includes/diff/Hook/TextSlotDiffRendererTablePrefixHook.php +++ b/includes/diff/Hook/TextSlotDiffRendererTablePrefixHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Diff\Hook; -use IContextSource; +use MediaWiki\Context\IContextSource; use TextSlotDiffRenderer; /** diff --git a/includes/diff/SlotDiffRenderer.php b/includes/diff/SlotDiffRenderer.php index d4d40042eeef..9da566cf0ef0 100644 --- a/includes/diff/SlotDiffRenderer.php +++ b/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; diff --git a/includes/diff/TextSlotDiffRenderer.php b/includes/diff/TextSlotDiffRenderer.php index bb44281bbda1..aced2dbdc389 100644 --- a/includes/diff/TextSlotDiffRenderer.php +++ b/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; diff --git a/includes/editpage/Constraint/EditConstraintFactory.php b/includes/editpage/Constraint/EditConstraintFactory.php index 023155eed5ff..2524c74b4fc0 100644 --- a/includes/editpage/Constraint/EditConstraintFactory.php +++ b/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; diff --git a/includes/editpage/Constraint/EditFilterMergedContentHookConstraint.php b/includes/editpage/Constraint/EditFilterMergedContentHookConstraint.php index d6a06b6b78e7..38718443b637 100644 --- a/includes/editpage/Constraint/EditFilterMergedContentHookConstraint.php +++ b/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; diff --git a/includes/editpage/EditPage.php b/includes/editpage/EditPage.php index cdfa78046e7b..40add1fcb050 100644 --- a/includes/editpage/EditPage.php +++ b/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; diff --git a/includes/editpage/ParametersHelper.php b/includes/editpage/ParametersHelper.php index 5d2c86681611..5c77e1969b5a 100644 --- a/includes/editpage/ParametersHelper.php +++ b/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. diff --git a/includes/editpage/TemplatesOnThisPageFormatter.php b/includes/editpage/TemplatesOnThisPageFormatter.php index d438cde5b01b..0857259bd009 100644 --- a/includes/editpage/TemplatesOnThisPageFormatter.php +++ b/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; diff --git a/includes/exception/MWExceptionRenderer.php b/includes/exception/MWExceptionRenderer.php index 6d08e29a7e28..b4ccb5bf31e0 100644 --- a/includes/exception/MWExceptionRenderer.php +++ b/includes/exception/MWExceptionRenderer.php @@ -18,6 +18,7 @@ * @file */ +use MediaWiki\Context\RequestContext; use MediaWiki\Html\Html; use MediaWiki\Language\RawMessage; use MediaWiki\MainConfigNames; diff --git a/includes/exception/PermissionsError.php b/includes/exception/PermissionsError.php index 50b401c1abf9..8d7d0ae9754e 100644 --- a/includes/exception/PermissionsError.php +++ b/includes/exception/PermissionsError.php @@ -18,6 +18,7 @@ * @file */ +use MediaWiki\Context\RequestContext; use MediaWiki\MediaWikiServices; use MediaWiki\Permissions\PermissionStatus; use MediaWiki\User\UserGroupMembership; diff --git a/includes/exception/UserBlockedError.php b/includes/exception/UserBlockedError.php index 8dfdeb791772..77ea900af1a9 100644 --- a/includes/exception/UserBlockedError.php +++ b/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; diff --git a/includes/exception/UserNotLoggedIn.php b/includes/exception/UserNotLoggedIn.php index e8047fcc144c..5ba58fff7ee4 100644 --- a/includes/exception/UserNotLoggedIn.php +++ b/includes/exception/UserNotLoggedIn.php @@ -18,6 +18,7 @@ * @file */ +use MediaWiki\Context\RequestContext; use MediaWiki\SpecialPage\SpecialPage; /** diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php index 92365d4c8939..3bf766c9c70e 100644 --- a/includes/filerepo/FileRepo.php +++ b/includes/filerepo/FileRepo.php @@ -7,6 +7,7 @@ * @details */ +use MediaWiki\Context\RequestContext; use MediaWiki\Linker\LinkTarget; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php index 3564ee704b3d..4b8a8e97d059 100644 --- a/includes/filerepo/LocalRepo.php +++ b/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; diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php index 1d4cf53720b2..12aadefbd041 100644 --- a/includes/filerepo/file/File.php +++ b/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; diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php index 25b6122489b3..4fa040594887 100644 --- a/includes/filerepo/file/LocalFile.php +++ b/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; diff --git a/includes/gallery/ImageGalleryBase.php b/includes/gallery/ImageGalleryBase.php index 07d67e6db5a0..3532ae48e021 100644 --- a/includes/gallery/ImageGalleryBase.php +++ b/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; diff --git a/includes/gallery/PackedImageGallery.php b/includes/gallery/PackedImageGallery.php index 77800a70d955..57381c97f823 100644 --- a/includes/gallery/PackedImageGallery.php +++ b/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 ); diff --git a/includes/gallery/SlideshowImageGallery.php b/includes/gallery/SlideshowImageGallery.php index 6bbea8762d93..8453f77a3148 100644 --- a/includes/gallery/SlideshowImageGallery.php +++ b/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 ); diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php index 1c8145958e17..aaf213ccdf17 100644 --- a/includes/htmlform/HTMLForm.php +++ b/includes/htmlform/HTMLForm.php @@ -21,6 +21,8 @@ * @file */ +use MediaWiki\Context\ContextSource; +use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\ProtectedHookAccessorTrait; use MediaWiki\Html\Html; use MediaWiki\Linker\Linker; diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php index 1556df1044b3..adbd7dd220bb 100644 --- a/includes/htmlform/HTMLFormField.php +++ b/includes/htmlform/HTMLFormField.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Html\Html; use MediaWiki\Linker\Linker; use MediaWiki\Request\WebRequest; diff --git a/includes/htmlform/fields/HTMLButtonField.php b/includes/htmlform/fields/HTMLButtonField.php index 08f23c3f94b9..678dec754825 100644 --- a/includes/htmlform/fields/HTMLButtonField.php +++ b/includes/htmlform/fields/HTMLButtonField.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Html\Html; /** diff --git a/includes/htmlform/fields/HTMLTimezoneField.php b/includes/htmlform/fields/HTMLTimezoneField.php index 78bfb3aef186..63e7f8e3c9b4 100644 --- a/includes/htmlform/fields/HTMLTimezoneField.php +++ b/includes/htmlform/fields/HTMLTimezoneField.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\User\UserTimeCorrection; diff --git a/includes/import/ImportableOldRevisionImporter.php b/includes/import/ImportableOldRevisionImporter.php index ed6f59781e6b..4bf6e8e54ac2 100644 --- a/includes/import/ImportableOldRevisionImporter.php +++ b/includes/import/ImportableOldRevisionImporter.php @@ -1,6 +1,7 @@ <?php use MediaWiki\CommentStore\CommentStoreComment; +use MediaWiki\Context\RequestContext; use MediaWiki\MediaWikiServices; use MediaWiki\Page\WikiPageFactory; use MediaWiki\Revision\MutableRevisionRecord; diff --git a/includes/import/WikiImporterFactory.php b/includes/import/WikiImporterFactory.php index c879aa9a5ce8..c5b436f87896 100644 --- a/includes/import/WikiImporterFactory.php +++ b/includes/import/WikiImporterFactory.php @@ -21,6 +21,7 @@ use MediaWiki\Config\Config; use MediaWiki\Content\IContentHandlerFactory; +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookContainer; use MediaWiki\Page\WikiPageFactory; use MediaWiki\Permissions\Authority; diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php index 8d958a71c747..f7bf326ca3f0 100644 --- a/includes/installer/CliInstaller.php +++ b/includes/installer/CliInstaller.php @@ -22,11 +22,11 @@ namespace MediaWiki\Installer; +use MediaWiki\Context\RequestContext; use MediaWiki\MediaWikiServices; use MediaWiki\Parser\Sanitizer; use MediaWiki\Status\Status; use MediaWiki\User\User; -use RequestContext; use UserPasswordPolicy; /** diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index 76ae8840ff69..08b49724a8ef 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -41,6 +41,7 @@ use MediaWiki\Config\Config; use MediaWiki\Config\GlobalVarConfig; use MediaWiki\Config\HashConfig; use MediaWiki\Config\MultiConfig; +use MediaWiki\Context\RequestContext; use MediaWiki\Deferred\SiteStatsUpdate; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\StaticHookRegistry; @@ -56,7 +57,6 @@ use MediaWiki\User\User; use MWCryptRand; use Parser; use ParserOptions; -use RequestContext; use Wikimedia\AtEase\AtEase; use Wikimedia\Services\ServiceDisabledException; use WikitextContent; diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php index 2430a515adc1..1db5f0640a9b 100644 --- a/includes/installer/WebInstaller.php +++ b/includes/installer/WebInstaller.php @@ -25,13 +25,13 @@ namespace MediaWiki\Installer; use Exception; use HtmlArmor; +use MediaWiki\Context\RequestContext; use MediaWiki\Html\Html; use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\MediaWikiServices; use MediaWiki\Request\WebRequest; use MediaWiki\Status\Status; use Message; -use RequestContext; use Xml; /** diff --git a/includes/jobqueue/jobs/AssembleUploadChunksJob.php b/includes/jobqueue/jobs/AssembleUploadChunksJob.php index 9bb29110b489..c8087b72f62c 100644 --- a/includes/jobqueue/jobs/AssembleUploadChunksJob.php +++ b/includes/jobqueue/jobs/AssembleUploadChunksJob.php @@ -18,6 +18,7 @@ * @file */ +use MediaWiki\Context\RequestContext; use MediaWiki\Request\WebRequestUpload; use MediaWiki\Status\Status; use MediaWiki\Title\Title; diff --git a/includes/jobqueue/jobs/PublishStashedFileJob.php b/includes/jobqueue/jobs/PublishStashedFileJob.php index fb70af49ae3f..29160368bd6d 100644 --- a/includes/jobqueue/jobs/PublishStashedFileJob.php +++ b/includes/jobqueue/jobs/PublishStashedFileJob.php @@ -18,6 +18,7 @@ * @file */ +use MediaWiki\Context\RequestContext; use MediaWiki\Status\Status; use Wikimedia\ScopedCallback; diff --git a/includes/language/Language.php b/includes/language/Language.php index fb15e30ab1d2..08181236046e 100644 --- a/includes/language/Language.php +++ b/includes/language/Language.php @@ -31,6 +31,7 @@ use CLDRPluralRuleParser\Evaluator; use MediaWiki\Config\Config; +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Languages\Data\NormalizeAr; diff --git a/includes/language/LanguageConverter.php b/includes/language/LanguageConverter.php index 9ec8d174c736..02f4a6f47f6b 100644 --- a/includes/language/LanguageConverter.php +++ b/includes/language/LanguageConverter.php @@ -22,6 +22,7 @@ * @author PhiLiP <philip.npc@gmail.com> */ +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Html\Html; use MediaWiki\Linker\LinkTarget; diff --git a/includes/language/Message.php b/includes/language/Message.php index 83543274d323..df6ab579cfc5 100644 --- a/includes/language/Message.php +++ b/includes/language/Message.php @@ -19,6 +19,8 @@ * @author Niklas Laxström */ +use MediaWiki\Context\IContextSource; +use MediaWiki\Context\RequestContext; use MediaWiki\Language\RawMessage; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; diff --git a/includes/language/MessageCache.php b/includes/language/MessageCache.php index aae4ee0f55e6..9f2ec6c45888 100644 --- a/includes/language/MessageCache.php +++ b/includes/language/MessageCache.php @@ -19,6 +19,7 @@ */ use MediaWiki\Config\ServiceOptions; +use MediaWiki\Context\RequestContext; use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Deferred\MessageCacheUpdate; use MediaWiki\HookContainer\HookContainer; diff --git a/includes/linker/DummyLinker.php b/includes/linker/DummyLinker.php index 217e2e4771cb..b846a6098ada 100644 --- a/includes/linker/DummyLinker.php +++ b/includes/linker/DummyLinker.php @@ -2,8 +2,8 @@ namespace MediaWiki\Linker; -use IContextSource; use Language; +use MediaWiki\Context\IContextSource; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Title\Title; use MediaWiki\User\User; diff --git a/includes/linker/Hook/LinkerGenerateRollbackLinkHook.php b/includes/linker/Hook/LinkerGenerateRollbackLinkHook.php index 28325bc040cb..8f6527b5f7c0 100644 --- a/includes/linker/Hook/LinkerGenerateRollbackLinkHook.php +++ b/includes/linker/Hook/LinkerGenerateRollbackLinkHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Linker\Hook; -use IContextSource; +use MediaWiki\Context\IContextSource; use MediaWiki\Linker\Linker; use MediaWiki\Revision\RevisionRecord; diff --git a/includes/linker/Linker.php b/includes/linker/Linker.php index 8254562481e4..5b240018cfd3 100644 --- a/includes/linker/Linker.php +++ b/includes/linker/Linker.php @@ -22,14 +22,15 @@ namespace MediaWiki\Linker; -use ContextSource; -use DerivativeContext; use File; use HtmlArmor; -use IContextSource; use Language; use MediaTransformError; use MediaTransformOutput; +use MediaWiki\Context\ContextSource; +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\IContextSource; +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Html\Html; use MediaWiki\Html\HtmlHelper; @@ -45,7 +46,6 @@ use MediaWiki\User\User; use Message; use MessageLocalizer; use Parser; -use RequestContext; use Wikimedia\Assert\Assert; use Wikimedia\IPUtils; use Wikimedia\Parsoid\Core\TOCData; diff --git a/includes/logging/LogEventsList.php b/includes/logging/LogEventsList.php index 85754c776e05..a65c07c31c0c 100644 --- a/includes/logging/LogEventsList.php +++ b/includes/logging/LogEventsList.php @@ -23,6 +23,9 @@ * @file */ +use MediaWiki\Context\ContextSource; +use MediaWiki\Context\IContextSource; +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Html\Html; use MediaWiki\Linker\Linker; diff --git a/includes/logging/LogFormatter.php b/includes/logging/LogFormatter.php index 705c3f07a5a4..c0f986cec6f2 100644 --- a/includes/logging/LogFormatter.php +++ b/includes/logging/LogFormatter.php @@ -23,6 +23,8 @@ * @since 1.19 */ +use MediaWiki\Context\IContextSource; +use MediaWiki\Context\RequestContext; use MediaWiki\Html\Html; use MediaWiki\Linker\Linker; use MediaWiki\Linker\LinkRenderer; diff --git a/includes/logging/LogPage.php b/includes/logging/LogPage.php index 9c587a8896d8..6044b4a4947b 100644 --- a/includes/logging/LogPage.php +++ b/includes/logging/LogPage.php @@ -23,6 +23,7 @@ * @file */ +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\SpecialPage\SpecialPage; diff --git a/includes/logging/ManualLogEntry.php b/includes/logging/ManualLogEntry.php index 2608e2b5f433..e54ddc472680 100644 --- a/includes/logging/ManualLogEntry.php +++ b/includes/logging/ManualLogEntry.php @@ -24,6 +24,7 @@ */ use MediaWiki\ChangeTags\Taggable; +use MediaWiki\Context\RequestContext; use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Linker\LinkTarget; diff --git a/includes/media/FormatMetadata.php b/includes/media/FormatMetadata.php index 9bd15d9d5509..6015b1fc3f8d 100644 --- a/includes/media/FormatMetadata.php +++ b/includes/media/FormatMetadata.php @@ -25,6 +25,8 @@ * @file */ +use MediaWiki\Context\ContextSource; +use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\ProtectedHookAccessorTrait; use MediaWiki\Html\Html; use MediaWiki\Logger\LoggerFactory; diff --git a/includes/media/Hook/GetExtendedMetadataHook.php b/includes/media/Hook/GetExtendedMetadataHook.php index 9b3b0621bc07..97c31c2ec5a1 100644 --- a/includes/media/Hook/GetExtendedMetadataHook.php +++ b/includes/media/Hook/GetExtendedMetadataHook.php @@ -3,7 +3,7 @@ namespace MediaWiki\Hook; use File; -use IContextSource; +use MediaWiki\Context\IContextSource; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/page/Article.php b/includes/page/Article.php index 24c7bc4208dd..db3bdf164008 100644 --- a/includes/page/Article.php +++ b/includes/page/Article.php @@ -21,6 +21,8 @@ use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\DatabaseBlockStore; use MediaWiki\CommentFormatter\CommentFormatter; +use MediaWiki\Context\IContextSource; +use MediaWiki\Context\RequestContext; use MediaWiki\EditPage\EditPage; use MediaWiki\HookContainer\HookRunner; use MediaWiki\HookContainer\ProtectedHookAccessorTrait; diff --git a/includes/page/Hook/ArticleFromTitleHook.php b/includes/page/Hook/ArticleFromTitleHook.php index 386eb20a1d24..1b96e1763650 100644 --- a/includes/page/Hook/ArticleFromTitleHook.php +++ b/includes/page/Hook/ArticleFromTitleHook.php @@ -3,7 +3,7 @@ namespace MediaWiki\Page\Hook; use Article; -use IContextSource; +use MediaWiki\Context\IContextSource; use MediaWiki\Title\Title; /** diff --git a/includes/page/ImageHistoryList.php b/includes/page/ImageHistoryList.php index 0dd65613757d..7018b07429e2 100644 --- a/includes/page/ImageHistoryList.php +++ b/includes/page/ImageHistoryList.php @@ -18,6 +18,7 @@ * @file */ +use MediaWiki\Context\ContextSource; use MediaWiki\HookContainer\ProtectedHookAccessorTrait; use MediaWiki\Html\Html; use MediaWiki\Linker\Linker; diff --git a/includes/page/MovePage.php b/includes/page/MovePage.php index 0aa51212b19e..6e345fbb08cb 100644 --- a/includes/page/MovePage.php +++ b/includes/page/MovePage.php @@ -30,6 +30,7 @@ use MediaWiki\Collation\CollationFactory; use MediaWiki\CommentStore\CommentStoreComment; use MediaWiki\Config\ServiceOptions; use MediaWiki\Content\IContentHandlerFactory; +use MediaWiki\Context\RequestContext; use MediaWiki\Deferred\AtomicSectionUpdate; use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\EditPage\SpamChecker; @@ -49,7 +50,6 @@ use MediaWiki\User\UserEditTracker; use MediaWiki\User\UserFactory; use MediaWiki\User\UserIdentity; use RepoGroup; -use RequestContext; use RuntimeException; use StringUtils; use WatchedItemStoreInterface; diff --git a/includes/page/ProtectionForm.php b/includes/page/ProtectionForm.php index 9e439c1872b0..bd6cacd2a363 100644 --- a/includes/page/ProtectionForm.php +++ b/includes/page/ProtectionForm.php @@ -28,11 +28,11 @@ namespace MediaWiki\Page; use Article; use ErrorPageError; use HTMLForm; -use IContextSource; use Language; use LogEventsList; use LogPage; use MediaWiki\CommentStore\CommentStore; +use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Html\Html; use MediaWiki\MediaWikiServices; diff --git a/includes/pager/IndexPager.php b/includes/pager/IndexPager.php index e39d8f4f8487..cef5d7f52dd7 100644 --- a/includes/pager/IndexPager.php +++ b/includes/pager/IndexPager.php @@ -20,9 +20,9 @@ namespace MediaWiki\Pager; -use ContextSource; use HtmlArmor; -use IContextSource; +use MediaWiki\Context\ContextSource; +use MediaWiki\Context\IContextSource; use MediaWiki\Html\Html; use MediaWiki\Linker\LinkRenderer; use MediaWiki\MediaWikiServices; diff --git a/includes/pager/TablePager.php b/includes/pager/TablePager.php index fc16a416889b..936a63549a06 100644 --- a/includes/pager/TablePager.php +++ b/includes/pager/TablePager.php @@ -20,7 +20,7 @@ namespace MediaWiki\Pager; -use IContextSource; +use MediaWiki\Context\IContextSource; use MediaWiki\Html\Html; use MediaWiki\Linker\LinkRenderer; use MediaWiki\Parser\ParserOutput; diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index 4952a38bd774..5b824e45632e 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -24,6 +24,7 @@ use MediaWiki\Cache\CacheKeyHelper; use MediaWiki\Category\TrackingCategories; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Http\HttpRequestFactory; diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php index 56259de17c09..d352b1a21dfd 100644 --- a/includes/parser/ParserOptions.php +++ b/includes/parser/ParserOptions.php @@ -21,6 +21,7 @@ * @ingroup Parser */ +use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php index 7c7bf6c28904..45fae53ef2e0 100644 --- a/includes/preferences/DefaultPreferencesFactory.php +++ b/includes/preferences/DefaultPreferencesFactory.php @@ -22,7 +22,6 @@ namespace MediaWiki\Preferences; use HTMLForm; use HTMLFormField; -use IContextSource; use ILanguageConverter; use Language; use LanguageCode; @@ -31,6 +30,7 @@ use MediaWiki\Auth\AuthManager; use MediaWiki\Auth\PasswordAuthenticationRequest; use MediaWiki\Config\Config; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Html\Html; diff --git a/includes/preferences/PreferencesFactory.php b/includes/preferences/PreferencesFactory.php index ee8d0826adc3..75ea2070e884 100644 --- a/includes/preferences/PreferencesFactory.php +++ b/includes/preferences/PreferencesFactory.php @@ -21,7 +21,7 @@ namespace MediaWiki\Preferences; use HTMLForm; -use IContextSource; +use MediaWiki\Context\IContextSource; use MediaWiki\User\User; use PreferencesFormOOUI; diff --git a/includes/revisiondelete/RevDelArchiveList.php b/includes/revisiondelete/RevDelArchiveList.php index 250d8aca334e..1f350352a08b 100644 --- a/includes/revisiondelete/RevDelArchiveList.php +++ b/includes/revisiondelete/RevDelArchiveList.php @@ -19,6 +19,7 @@ * @ingroup RevisionDelete */ +use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\HookContainer; use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageIdentity; diff --git a/includes/revisiondelete/RevDelArchivedFileList.php b/includes/revisiondelete/RevDelArchivedFileList.php index 430680a544c8..ca9cf8adbe57 100644 --- a/includes/revisiondelete/RevDelArchivedFileList.php +++ b/includes/revisiondelete/RevDelArchivedFileList.php @@ -19,6 +19,7 @@ * @ingroup RevisionDelete */ +use MediaWiki\Context\IContextSource; use MediaWiki\FileRepo\File\FileSelectQueryBuilder; use MediaWiki\Page\PageIdentity; use Wikimedia\Rdbms\IDatabase; diff --git a/includes/revisiondelete/RevDelFileList.php b/includes/revisiondelete/RevDelFileList.php index 3f023b7a54f1..d80a03650d3a 100644 --- a/includes/revisiondelete/RevDelFileList.php +++ b/includes/revisiondelete/RevDelFileList.php @@ -19,6 +19,7 @@ * @ingroup RevisionDelete */ +use MediaWiki\Context\IContextSource; use MediaWiki\FileRepo\File\FileSelectQueryBuilder; use MediaWiki\Page\PageIdentity; use MediaWiki\Status\Status; diff --git a/includes/revisiondelete/RevDelList.php b/includes/revisiondelete/RevDelList.php index 91b226308697..6ba791403bc2 100644 --- a/includes/revisiondelete/RevDelList.php +++ b/includes/revisiondelete/RevDelList.php @@ -19,6 +19,7 @@ * @ingroup RevisionDelete */ +use MediaWiki\Context\IContextSource; use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Page\PageIdentity; use MediaWiki\Revision\RevisionRecord; diff --git a/includes/revisiondelete/RevDelLogList.php b/includes/revisiondelete/RevDelLogList.php index 8bf5d5d95f38..64d7704914b2 100644 --- a/includes/revisiondelete/RevDelLogList.php +++ b/includes/revisiondelete/RevDelLogList.php @@ -20,6 +20,7 @@ */ use MediaWiki\CommentStore\CommentStore; +use MediaWiki\Context\IContextSource; use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageIdentity; use MediaWiki\SpecialPage\SpecialPage; diff --git a/includes/revisiondelete/RevDelRevisionList.php b/includes/revisiondelete/RevDelRevisionList.php index e2fa646139e1..4e4b3cd786fa 100644 --- a/includes/revisiondelete/RevDelRevisionList.php +++ b/includes/revisiondelete/RevDelRevisionList.php @@ -19,6 +19,7 @@ * @ingroup RevisionDelete */ +use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MediaWikiServices; diff --git a/includes/revisiondelete/RevisionDeleter.php b/includes/revisiondelete/RevisionDeleter.php index b9aacd58b359..b97b8b778052 100644 --- a/includes/revisiondelete/RevisionDeleter.php +++ b/includes/revisiondelete/RevisionDeleter.php @@ -21,6 +21,7 @@ * @ingroup RevisionDelete */ +use MediaWiki\Context\IContextSource; use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageIdentity; use MediaWiki\Revision\RevisionRecord; diff --git a/includes/revisionlist/RevisionItem.php b/includes/revisionlist/RevisionItem.php index d7412f3712bd..58d3fb2bfb0b 100644 --- a/includes/revisionlist/RevisionItem.php +++ b/includes/revisionlist/RevisionItem.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\Context\RequestContext; use MediaWiki\Linker\Linker; use MediaWiki\MediaWikiServices; use MediaWiki\Revision\RevisionRecord; diff --git a/includes/revisionlist/RevisionListBase.php b/includes/revisionlist/RevisionListBase.php index 37791d6dd61a..2ceec8164dd7 100644 --- a/includes/revisionlist/RevisionListBase.php +++ b/includes/revisionlist/RevisionListBase.php @@ -20,6 +20,8 @@ * @file */ +use MediaWiki\Context\ContextSource; +use MediaWiki\Context\IContextSource; use MediaWiki\Page\PageIdentity; use MediaWiki\Title\Title; use Wikimedia\Rdbms\IDatabase; diff --git a/includes/session/SessionManager.php b/includes/session/SessionManager.php index e6eb0dd66be7..5ece8ae00297 100644 --- a/includes/session/SessionManager.php +++ b/includes/session/SessionManager.php @@ -27,6 +27,7 @@ use BagOStuff; use CachedBagOStuff; use LogicException; use MediaWiki\Config\Config; +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; @@ -146,7 +147,7 @@ class SessionManager implements SessionManagerInterface { $id = session_id(); } - $request = \RequestContext::getMain()->getRequest(); + $request = RequestContext::getMain()->getRequest(); if ( !self::$globalSession // No global session is set up yet || self::$globalSessionRequest !== $request // The global WebRequest changed diff --git a/includes/session/SessionProvider.php b/includes/session/SessionProvider.php index c347363d8646..59b6d2787e6f 100644 --- a/includes/session/SessionProvider.php +++ b/includes/session/SessionProvider.php @@ -27,6 +27,7 @@ use ApiUsageException; use ErrorPageError; use Language; use MediaWiki\Config\Config; +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; @@ -35,7 +36,6 @@ use MediaWiki\User\User; use MediaWiki\User\UserNameUtils; use MWRestrictions; use Psr\Log\LoggerInterface; -use RequestContext; /** * A SessionProvider provides SessionInfo and support for Session diff --git a/includes/skins/Hook/UndeletePageToolLinksHook.php b/includes/skins/Hook/UndeletePageToolLinksHook.php index 57f1416c3380..e6f494ac9a3c 100644 --- a/includes/skins/Hook/UndeletePageToolLinksHook.php +++ b/includes/skins/Hook/UndeletePageToolLinksHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Hook; -use IContextSource; +use MediaWiki\Context\IContextSource; use MediaWiki\Linker\LinkRenderer; /** diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php index 3585b821340f..12037d6b699d 100644 --- a/includes/skins/Skin.php +++ b/includes/skins/Skin.php @@ -18,6 +18,7 @@ * @file */ +use MediaWiki\Context\ContextSource; use MediaWiki\HookContainer\ProtectedHookAccessorTrait; use MediaWiki\Html\Html; use MediaWiki\MainConfigNames; diff --git a/includes/skins/components/SkinComponentRegistryContext.php b/includes/skins/components/SkinComponentRegistryContext.php index 6eb1d4186e6a..4dd42b17f910 100644 --- a/includes/skins/components/SkinComponentRegistryContext.php +++ b/includes/skins/components/SkinComponentRegistryContext.php @@ -18,9 +18,9 @@ namespace MediaWiki\Skin; -use IContextSource; use Language; use MediaWiki\Config\Config; +use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\ProtectedHookAccessorTrait; use MediaWiki\Output\OutputPage; use MediaWiki\Title\Title; diff --git a/includes/specialpage/AuthManagerSpecialPage.php b/includes/specialpage/AuthManagerSpecialPage.php index 33b75ba7f81b..a978257561a8 100644 --- a/includes/specialpage/AuthManagerSpecialPage.php +++ b/includes/specialpage/AuthManagerSpecialPage.php @@ -2,7 +2,6 @@ namespace MediaWiki\SpecialPage; -use DerivativeContext; use ErrorPageError; use HTMLForm; use HTMLInfoField; @@ -11,6 +10,7 @@ use LogicException; use MediaWiki\Auth\AuthenticationRequest; use MediaWiki\Auth\AuthenticationResponse; use MediaWiki\Auth\AuthManager; +use MediaWiki\Context\DerivativeContext; use MediaWiki\Language\RawMessage; use MediaWiki\Logger\LoggerFactory; use MediaWiki\Request\DerivativeRequest; diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php index c9e330f14956..bef08fbc61e7 100644 --- a/includes/specialpage/ChangesListSpecialPage.php +++ b/includes/specialpage/ChangesListSpecialPage.php @@ -26,8 +26,8 @@ use ChangesListFilterGroup; use ChangesListStringOptionsFilterGroup; use ChangeTags; use FormatJson; -use IContextSource; use LogFormatter; +use MediaWiki\Context\IContextSource; use MediaWiki\Html\FormOptions; use MediaWiki\Html\Html; use MediaWiki\MainConfigNames; diff --git a/includes/specialpage/FormSpecialPage.php b/includes/specialpage/FormSpecialPage.php index cf068da08fc8..d4c4813a3dc0 100644 --- a/includes/specialpage/FormSpecialPage.php +++ b/includes/specialpage/FormSpecialPage.php @@ -23,8 +23,8 @@ namespace MediaWiki\SpecialPage; -use DerivativeContext; use HTMLForm; +use MediaWiki\Context\DerivativeContext; use MediaWiki\Request\DerivativeRequest; use MediaWiki\Status\Status; use MediaWiki\User\User; diff --git a/includes/specialpage/LoginSignupSpecialPage.php b/includes/specialpage/LoginSignupSpecialPage.php index e4efe94366d0..4ac9b6873cc7 100644 --- a/includes/specialpage/LoginSignupSpecialPage.php +++ b/includes/specialpage/LoginSignupSpecialPage.php @@ -23,7 +23,6 @@ namespace MediaWiki\SpecialPage; -use DerivativeContext; use ErrorPageError; use Exception; use FatalError; @@ -34,6 +33,8 @@ use MediaWiki\Auth\AuthenticationRequest; use MediaWiki\Auth\AuthenticationResponse; use MediaWiki\Auth\AuthManager; use MediaWiki\Auth\PasswordAuthenticationRequest; +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\RequestContext; use MediaWiki\Html\Html; use MediaWiki\Language\RawMessage; use MediaWiki\Logger\LoggerFactory; @@ -48,7 +49,6 @@ use MediaWiki\User\User; use Message; use PermissionsError; use ReadOnlyError; -use RequestContext; use Skin; use StatusValue; use Wikimedia\ScopedCallback; diff --git a/includes/specialpage/SpecialPage.php b/includes/specialpage/SpecialPage.php index 59661892c308..f19ab185b41a 100644 --- a/includes/specialpage/SpecialPage.php +++ b/includes/specialpage/SpecialPage.php @@ -24,10 +24,11 @@ namespace MediaWiki\SpecialPage; use ErrorPageError; -use IContextSource; use Language; use MediaWiki\Auth\AuthManager; use MediaWiki\Config\Config; +use MediaWiki\Context\IContextSource; +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Language\RawMessage; @@ -47,7 +48,6 @@ use MessageSpecifier; use MWCryptRand; use PermissionsError; use ReadOnlyError; -use RequestContext; use SearchEngineFactory; use Skin; use UserNotLoggedIn; diff --git a/includes/specialpage/SpecialPageFactory.php b/includes/specialpage/SpecialPageFactory.php index 77f346d2992f..bc33ef7c3832 100644 --- a/includes/specialpage/SpecialPageFactory.php +++ b/includes/specialpage/SpecialPageFactory.php @@ -24,9 +24,10 @@ namespace MediaWiki\SpecialPage; -use IContextSource; use Language; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Context\IContextSource; +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Linker\LinkRenderer; @@ -173,7 +174,6 @@ use MediaWiki\Title\Title; use MediaWiki\Title\TitleFactory; use MediaWiki\User\User; use Profiler; -use RequestContext; use Wikimedia\DebugInfo\DebugInfoTrait; use Wikimedia\ObjectFactory\ObjectFactory; diff --git a/includes/specials/Hook/SpecialContributions__formatRow__flagsHook.php b/includes/specials/Hook/SpecialContributions__formatRow__flagsHook.php index 68bfba6aaabf..70263e2e1d2d 100644 --- a/includes/specials/Hook/SpecialContributions__formatRow__flagsHook.php +++ b/includes/specials/Hook/SpecialContributions__formatRow__flagsHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Hook; -use IContextSource; +use MediaWiki\Context\IContextSource; use stdClass; // phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps diff --git a/includes/specials/Hook/SpecialCreateAccountBenefitsHook.php b/includes/specials/Hook/SpecialCreateAccountBenefitsHook.php index 74cd8bdb05fa..b0057e4b2655 100644 --- a/includes/specials/Hook/SpecialCreateAccountBenefitsHook.php +++ b/includes/specials/Hook/SpecialCreateAccountBenefitsHook.php @@ -20,7 +20,7 @@ interface SpecialCreateAccountBenefitsHook { * @param array $info Array of information: * - context: (IContextSource) Context object. * - form: (HTMLForm) The signup form. Read-only - the form HTML has already been generated. - * @phan-param array{context:\IContextSource,form:\HTMLForm} $info + * @phan-param array{context:\MediaWiki\Context\IContextSource,form:\HTMLForm} $info * @param array &$options Array of modifiable options: * - beforeForm: (bool, default false) Whether to insert the HTML before the form. This is * mainly useful on mobile (where the login form might push the benefits out of view; but diff --git a/includes/specials/Hook/SpecialStatsAddExtraHook.php b/includes/specials/Hook/SpecialStatsAddExtraHook.php index 228eaa93db1f..f81d4b4da0f6 100644 --- a/includes/specials/Hook/SpecialStatsAddExtraHook.php +++ b/includes/specials/Hook/SpecialStatsAddExtraHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Hook; -use IContextSource; +use MediaWiki\Context\IContextSource; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php index e9041ab820f7..8c0e6a2db6a3 100644 --- a/includes/specials/SpecialBlock.php +++ b/includes/specials/SpecialBlock.php @@ -26,7 +26,6 @@ namespace MediaWiki\Specials; use ErrorPageError; use HtmlArmor; use HTMLForm; -use IContextSource; use Language; use LogEventsList; use MediaWiki\Block\BlockActionInfo; @@ -40,6 +39,7 @@ use MediaWiki\Block\Restriction\ActionRestriction; use MediaWiki\Block\Restriction\NamespaceRestriction; use MediaWiki\Block\Restriction\PageRestriction; use MediaWiki\CommentStore\CommentStore; +use MediaWiki\Context\IContextSource; use MediaWiki\Html\Html; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; diff --git a/includes/specials/SpecialEmailUser.php b/includes/specials/SpecialEmailUser.php index 59d6795ca811..5a289d8eab7e 100644 --- a/includes/specials/SpecialEmailUser.php +++ b/includes/specials/SpecialEmailUser.php @@ -25,8 +25,8 @@ namespace MediaWiki\Specials; use ErrorPageError; use HTMLForm; -use IContextSource; use MediaWiki\Config\Config; +use MediaWiki\Context\IContextSource; use MediaWiki\Mail\EmailUserFactory; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; diff --git a/includes/specials/SpecialNewFiles.php b/includes/specials/SpecialNewFiles.php index 14b87bc1c1d5..8b0d9c3473b4 100644 --- a/includes/specials/SpecialNewFiles.php +++ b/includes/specials/SpecialNewFiles.php @@ -23,11 +23,11 @@ namespace MediaWiki\Specials; -use DerivativeContext; use HTMLForm; use HTMLUserTextField; -use IContextSource; use MediaWiki\Cache\LinkBatchFactory; +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\IContextSource; use MediaWiki\Html\FormOptions; use MediaWiki\Html\Html; use MediaWiki\Pager\NewFilesPager; diff --git a/includes/specials/SpecialPageLanguage.php b/includes/specials/SpecialPageLanguage.php index 4b11ccf27018..9c7b3f5f2d04 100644 --- a/includes/specials/SpecialPageLanguage.php +++ b/includes/specials/SpecialPageLanguage.php @@ -27,11 +27,11 @@ namespace MediaWiki\Specials; use ApiMessage; use HTMLForm; -use IContextSource; use LogEventsList; use LogPage; use ManualLogEntry; use MediaWiki\Content\IContentHandlerFactory; +use MediaWiki\Context\IContextSource; use MediaWiki\Language\RawMessage; use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\MainConfigNames; diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php index a5ee53f12b19..5888181620db 100644 --- a/includes/specials/SpecialPreferences.php +++ b/includes/specials/SpecialPreferences.php @@ -24,7 +24,7 @@ namespace MediaWiki\Specials; use HTMLForm; -use IContextSource; +use MediaWiki\Context\IContextSource; use MediaWiki\Html\Html; use MediaWiki\MediaWikiServices; use MediaWiki\Preferences\PreferencesFactory; diff --git a/includes/specials/SpecialRecentChanges.php b/includes/specials/SpecialRecentChanges.php index 3ef25005faf9..9e3e9e464e94 100644 --- a/includes/specials/SpecialRecentChanges.php +++ b/includes/specials/SpecialRecentChanges.php @@ -28,8 +28,8 @@ use ChangesListBooleanFilter; use ChangesListStringOptionsFilterGroup; use ChangeTags; use HtmlArmor; -use IContextSource; use MediaWiki\ChangeTags\ChangeTagsStore; +use MediaWiki\Context\IContextSource; use MediaWiki\Html\FormOptions; use MediaWiki\Html\Html; use MediaWiki\MainConfigNames; diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index a567be305b28..73bd4492b4ae 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -26,7 +26,6 @@ namespace MediaWiki\Specials; use ArchivedFile; use ChangesList; use ChangeTags; -use DerivativeContext; use ErrorPageError; use File; use IDBAccessObject; @@ -38,6 +37,7 @@ use MediaWiki\Cache\LinkBatchFactory; use MediaWiki\CommentFormatter\CommentFormatter; use MediaWiki\CommentStore\CommentStore; use MediaWiki\Content\IContentHandlerFactory; +use MediaWiki\Context\DerivativeContext; use MediaWiki\Html\Html; use MediaWiki\Linker\Linker; use MediaWiki\MainConfigNames; diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index 9cd1c7b177ec..4b2215e5a4e1 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -27,9 +27,9 @@ use ChangesList; use ChangesListBooleanFilterGroup; use ChangesListStringOptionsFilterGroup; use EnhancedChangesList; -use IContextSource; use LogPage; use MediaWiki\ChangeTags\ChangeTagsStore; +use MediaWiki\Context\IContextSource; use MediaWiki\Html\FormOptions; use MediaWiki\Html\Html; use MediaWiki\MainConfigNames; diff --git a/includes/specials/forms/UploadForm.php b/includes/specials/forms/UploadForm.php index 81ccf038db9b..77328e3daec0 100644 --- a/includes/specials/forms/UploadForm.php +++ b/includes/specials/forms/UploadForm.php @@ -18,6 +18,7 @@ * @file */ +use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Html\Html; diff --git a/includes/specials/helpers/ImportReporter.php b/includes/specials/helpers/ImportReporter.php index 37e19e333687..e4268b4cce86 100644 --- a/includes/specials/helpers/ImportReporter.php +++ b/includes/specials/helpers/ImportReporter.php @@ -19,6 +19,8 @@ */ use MediaWiki\CommentStore\CommentStoreComment; +use MediaWiki\Context\ContextSource; +use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\ProtectedHookAccessorTrait; use MediaWiki\Html\Html; use MediaWiki\MediaWikiServices; diff --git a/includes/specials/helpers/LoginHelper.php b/includes/specials/helpers/LoginHelper.php index 0c0beec47c46..554b3aa6c43a 100644 --- a/includes/specials/helpers/LoginHelper.php +++ b/includes/specials/helpers/LoginHelper.php @@ -1,5 +1,7 @@ <?php +use MediaWiki\Context\ContextSource; +use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\HookRunner; use MediaWiki\HookContainer\ProtectedHookAccessorTrait; use MediaWiki\MainConfigNames; diff --git a/includes/specials/pagers/ActiveUsersPager.php b/includes/specials/pagers/ActiveUsersPager.php index e8983aa9c5f3..188ab5f28f67 100644 --- a/includes/specials/pagers/ActiveUsersPager.php +++ b/includes/specials/pagers/ActiveUsersPager.php @@ -21,9 +21,9 @@ namespace MediaWiki\Pager; -use IContextSource; use MediaWiki\Block\HideUserUtils; use MediaWiki\Cache\LinkBatchFactory; +use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\HookContainer; use MediaWiki\Html\FormOptions; use MediaWiki\Html\Html; diff --git a/includes/specials/pagers/AllMessagesTablePager.php b/includes/specials/pagers/AllMessagesTablePager.php index 15657a4f70bb..3e3111785dad 100644 --- a/includes/specials/pagers/AllMessagesTablePager.php +++ b/includes/specials/pagers/AllMessagesTablePager.php @@ -21,9 +21,9 @@ namespace MediaWiki\Pager; -use IContextSource; use Language; use LocalisationCache; +use MediaWiki\Context\IContextSource; use MediaWiki\Html\FormOptions; use MediaWiki\Html\Html; use MediaWiki\Languages\LanguageFactory; diff --git a/includes/specials/pagers/BlockListPager.php b/includes/specials/pagers/BlockListPager.php index df9ca9184361..e045d065fdcb 100644 --- a/includes/specials/pagers/BlockListPager.php +++ b/includes/specials/pagers/BlockListPager.php @@ -21,7 +21,6 @@ namespace MediaWiki\Pager; -use IContextSource; use MediaWiki\Block\Block; use MediaWiki\Block\BlockActionInfo; use MediaWiki\Block\BlockRestrictionStore; @@ -35,6 +34,7 @@ use MediaWiki\Cache\LinkBatchFactory; use MediaWiki\CommentFormatter\RowCommentFormatter; use MediaWiki\CommentStore\CommentStore; use MediaWiki\Config\ConfigException; +use MediaWiki\Context\IContextSource; use MediaWiki\Html\Html; use MediaWiki\Linker\Linker; use MediaWiki\Linker\LinkRenderer; diff --git a/includes/specials/pagers/CategoryPager.php b/includes/specials/pagers/CategoryPager.php index bd31198a4325..36110af90557 100644 --- a/includes/specials/pagers/CategoryPager.php +++ b/includes/specials/pagers/CategoryPager.php @@ -22,8 +22,8 @@ namespace MediaWiki\Pager; use HTMLForm; -use IContextSource; use MediaWiki\Cache\LinkBatchFactory; +use MediaWiki\Context\IContextSource; use MediaWiki\Html\Html; use MediaWiki\Linker\LinkRenderer; use MediaWiki\Title\Title; diff --git a/includes/specials/pagers/ContribsPager.php b/includes/specials/pagers/ContribsPager.php index 0f9493fde3da..7602c2f8ad0b 100644 --- a/includes/specials/pagers/ContribsPager.php +++ b/includes/specials/pagers/ContribsPager.php @@ -25,12 +25,12 @@ use ChangesList; use ChangeTags; use DateTime; use HtmlArmor; -use IContextSource; use InvalidArgumentException; use MapCacheLRU; use MediaWiki\Cache\LinkBatchFactory; use MediaWiki\CommentFormatter\CommentFormatter; use MediaWiki\Config\Config; +use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Html\Html; diff --git a/includes/specials/pagers/DeletedContribsPager.php b/includes/specials/pagers/DeletedContribsPager.php index ee9593a01959..2f25e68e4929 100644 --- a/includes/specials/pagers/DeletedContribsPager.php +++ b/includes/specials/pagers/DeletedContribsPager.php @@ -23,10 +23,10 @@ namespace MediaWiki\Pager; use ChangesList; use ChangeTags; -use IContextSource; use IDBAccessObject; use MediaWiki\Cache\LinkBatchFactory; use MediaWiki\CommentFormatter\CommentFormatter; +use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Html\Html; diff --git a/includes/specials/pagers/ImageListPager.php b/includes/specials/pagers/ImageListPager.php index d4edfdcb5a71..97bb16079ad3 100644 --- a/includes/specials/pagers/ImageListPager.php +++ b/includes/specials/pagers/ImageListPager.php @@ -22,10 +22,10 @@ namespace MediaWiki\Pager; use HTMLForm; -use IContextSource; use LocalRepo; use MediaWiki\CommentFormatter\CommentFormatter; use MediaWiki\CommentStore\CommentStore; +use MediaWiki\Context\IContextSource; use MediaWiki\Html\Html; use MediaWiki\Linker\LinkRenderer; use MediaWiki\MainConfigNames; diff --git a/includes/specials/pagers/MergeHistoryPager.php b/includes/specials/pagers/MergeHistoryPager.php index 69faf8e4dd8f..e5d68afe001a 100644 --- a/includes/specials/pagers/MergeHistoryPager.php +++ b/includes/specials/pagers/MergeHistoryPager.php @@ -22,9 +22,9 @@ namespace MediaWiki\Pager; use ChangeTags; -use IContextSource; use MediaWiki\Cache\LinkBatchFactory; use MediaWiki\CommentFormatter\CommentFormatter; +use MediaWiki\Context\IContextSource; use MediaWiki\Html\Html; use MediaWiki\Linker\Linker; use MediaWiki\Linker\LinkRenderer; diff --git a/includes/specials/pagers/NewFilesPager.php b/includes/specials/pagers/NewFilesPager.php index dfe2df9d46c8..3b85f1ee541c 100644 --- a/includes/specials/pagers/NewFilesPager.php +++ b/includes/specials/pagers/NewFilesPager.php @@ -21,10 +21,10 @@ namespace MediaWiki\Pager; -use IContextSource; use ImageGalleryBase; use ImageGalleryClassNotFoundException; use MediaWiki\Cache\LinkBatchFactory; +use MediaWiki\Context\IContextSource; use MediaWiki\Html\FormOptions; use MediaWiki\Linker\LinkRenderer; use MediaWiki\Permissions\GroupPermissionsLookup; diff --git a/includes/specials/pagers/NewPagesPager.php b/includes/specials/pagers/NewPagesPager.php index 1bfb0da98e23..ca2c3bcc1ff7 100644 --- a/includes/specials/pagers/NewPagesPager.php +++ b/includes/specials/pagers/NewPagesPager.php @@ -24,12 +24,12 @@ namespace MediaWiki\Pager; use ChangesList; use ChangeTags; use HtmlArmor; -use IContextSource; use MapCacheLRU; use MediaWiki\Cache\LinkBatchFactory; use MediaWiki\ChangeTags\ChangeTagsStore; use MediaWiki\CommentFormatter\RowCommentFormatter; use MediaWiki\Content\IContentHandlerFactory; +use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Html\FormOptions; diff --git a/includes/specials/pagers/PagerTools.php b/includes/specials/pagers/PagerTools.php index 47b37e237008..bb1567e25da0 100644 --- a/includes/specials/pagers/PagerTools.php +++ b/includes/specials/pagers/PagerTools.php @@ -2,7 +2,7 @@ namespace MediaWiki\Pager; -use IContextSource; +use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Html\Html; use MediaWiki\Linker\Linker; diff --git a/includes/specials/pagers/ProtectedPagesPager.php b/includes/specials/pagers/ProtectedPagesPager.php index 664c05b1c622..31eba40df237 100644 --- a/includes/specials/pagers/ProtectedPagesPager.php +++ b/includes/specials/pagers/ProtectedPagesPager.php @@ -21,12 +21,12 @@ namespace MediaWiki\Pager; -use IContextSource; use LogEventsList; use LogPage; use MediaWiki\Cache\LinkBatchFactory; use MediaWiki\CommentFormatter\RowCommentFormatter; use MediaWiki\CommentStore\CommentStore; +use MediaWiki\Context\IContextSource; use MediaWiki\Html\Html; use MediaWiki\Linker\Linker; use MediaWiki\Linker\LinkRenderer; diff --git a/includes/specials/pagers/ProtectedTitlesPager.php b/includes/specials/pagers/ProtectedTitlesPager.php index 7424401dcfa4..d87894ccf12a 100644 --- a/includes/specials/pagers/ProtectedTitlesPager.php +++ b/includes/specials/pagers/ProtectedTitlesPager.php @@ -21,8 +21,8 @@ namespace MediaWiki\Pager; -use IContextSource; use MediaWiki\Cache\LinkBatchFactory; +use MediaWiki\Context\IContextSource; use MediaWiki\Html\Html; use MediaWiki\Linker\Linker; use MediaWiki\Linker\LinkRenderer; diff --git a/includes/specials/pagers/UsersPager.php b/includes/specials/pagers/UsersPager.php index 815a7bf17eb1..956c7828863d 100644 --- a/includes/specials/pagers/UsersPager.php +++ b/includes/specials/pagers/UsersPager.php @@ -31,8 +31,8 @@ use HTMLInfoField; use HTMLSelectField; use HTMLSubmitField; use HTMLUserTextField; -use IContextSource; use MediaWiki\Cache\LinkBatchFactory; +use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Html\Html; diff --git a/includes/title/Title.php b/includes/title/Title.php index a1388b9ad169..162624ed5fa9 100644 --- a/includes/title/Title.php +++ b/includes/title/Title.php @@ -32,6 +32,7 @@ use InvalidArgumentException; use Language; use LinkCache; use MapCacheLRU; +use MediaWiki\Context\RequestContext; use MediaWiki\DAO\WikiAwareEntityTrait; use MediaWiki\Deferred\AtomicSectionUpdate; use MediaWiki\Deferred\AutoCommitUpdate; @@ -56,7 +57,6 @@ use MediaWiki\Utils\MWTimestamp; use Message; use MessageLocalizer; use MWException; -use RequestContext; use RuntimeException; use stdClass; use Wikimedia\Assert\Assert; diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php index fd0f952db506..5eda26e075dc 100644 --- a/includes/upload/UploadBase.php +++ b/includes/upload/UploadBase.php @@ -21,6 +21,7 @@ * @ingroup Upload */ +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookRunner; use MediaWiki\HookContainer\ProtectedHookAccessorTrait; use MediaWiki\MainConfigNames; diff --git a/includes/upload/UploadFromUrl.php b/includes/upload/UploadFromUrl.php index 2c11d97af28d..c5eaf8f820f3 100644 --- a/includes/upload/UploadFromUrl.php +++ b/includes/upload/UploadFromUrl.php @@ -21,6 +21,7 @@ * @ingroup Upload */ +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; diff --git a/includes/upload/UploadStash.php b/includes/upload/UploadStash.php index 1d0311f5f78b..ecb3bdbd8f75 100644 --- a/includes/upload/UploadStash.php +++ b/includes/upload/UploadStash.php @@ -20,6 +20,7 @@ * @file */ +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\User\UserIdentity; diff --git a/includes/user/Options/UserOptionsManager.php b/includes/user/Options/UserOptionsManager.php index 4727ecc1520a..4569f5f47c67 100644 --- a/includes/user/Options/UserOptionsManager.php +++ b/includes/user/Options/UserOptionsManager.php @@ -24,12 +24,12 @@ use DBAccessObjectUtils; use HTMLCheckMatrix; use HTMLFormField; use HTMLMultiSelectField; -use IContextSource; use IDBAccessObject; use InvalidArgumentException; use LanguageCode; use LanguageConverter; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Languages\LanguageConverterFactory; diff --git a/includes/user/User.php b/includes/user/User.php index e54123792eaa..ae3d9ec8e60c 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -34,6 +34,7 @@ use MediaWiki\Auth\AuthManager; use MediaWiki\Block\AbstractBlock; use MediaWiki\Block\Block; use MediaWiki\Block\SystemBlock; +use MediaWiki\Context\RequestContext; use MediaWiki\DAO\WikiAwareEntityTrait; use MediaWiki\HookContainer\ProtectedHookAccessorTrait; use MediaWiki\Logger\LoggerFactory; @@ -56,7 +57,6 @@ use MWCryptHash; use MWCryptRand; use MWExceptionHandler; use PasswordFactory; -use RequestContext; use RuntimeException; use stdClass; use UnexpectedValueException; diff --git a/includes/user/UserGroupMembership.php b/includes/user/UserGroupMembership.php index ee7ef1435a30..91986a52d9f6 100644 --- a/includes/user/UserGroupMembership.php +++ b/includes/user/UserGroupMembership.php @@ -22,12 +22,12 @@ namespace MediaWiki\User; -use IContextSource; use InvalidArgumentException; +use MediaWiki\Context\IContextSource; +use MediaWiki\Context\RequestContext; use MediaWiki\MediaWikiServices; use MediaWiki\Title\Title; use Message; -use RequestContext; /** * Represents a "user group membership" -- a specific instance of a user belonging diff --git a/includes/utils/MWTimestamp.php b/includes/utils/MWTimestamp.php index d140009bd2d3..173fb242e901 100644 --- a/includes/utils/MWTimestamp.php +++ b/includes/utils/MWTimestamp.php @@ -26,6 +26,7 @@ namespace MediaWiki\Utils; use DateInterval; use Language; +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Language\RawMessage; use MediaWiki\MainConfigNames; @@ -34,7 +35,6 @@ use MediaWiki\User\User; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserTimeCorrection; use Message; -use RequestContext; use Wikimedia\Timestamp\ConvertibleTimestamp; /** diff --git a/index.php b/index.php index e110e26d7c47..f9cb22c3c4bd 100644 --- a/index.php +++ b/index.php @@ -35,6 +35,7 @@ */ use MediaWiki\Actions\ActionEntryPoint; +use MediaWiki\Context\RequestContext; use MediaWiki\EntryPointEnvironment; use MediaWiki\MediaWikiServices; @@ -26,6 +26,7 @@ * @author Trevor Parscal */ +use MediaWiki\Context\RequestContext; use MediaWiki\EntryPointEnvironment; use MediaWiki\MediaWikiServices; use MediaWiki\ResourceLoader\ResourceEntryPoint; diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php index 83af57256818..b9d04156d978 100644 --- a/maintenance/rebuildFileCache.php +++ b/maintenance/rebuildFileCache.php @@ -21,6 +21,7 @@ * @ingroup Maintenance */ +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Settings\SettingsBuilder; use MediaWiki\Title\Title; diff --git a/maintenance/update.php b/maintenance/update.php index 5151a976842c..f3df9e92a9af 100755 --- a/maintenance/update.php +++ b/maintenance/update.php @@ -29,6 +29,7 @@ require_once __DIR__ . '/Maintenance.php'; +use MediaWiki\Context\RequestContext; use MediaWiki\Installer\DatabaseInstaller; use MediaWiki\Installer\DatabaseUpdater; use MediaWiki\Installer\Installer; diff --git a/mw-config/index.php b/mw-config/index.php index 9f8250d874c5..2ba4bb6f305b 100644 --- a/mw-config/index.php +++ b/mw-config/index.php @@ -21,6 +21,7 @@ * @file */ +use MediaWiki\Context\RequestContext; use MediaWiki\Installer\Installer; use MediaWiki\Installer\InstallerOverrides; use MediaWiki\MediaWikiServices; diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php index 9bfe465a2320..9a999132953f 100644 --- a/tests/parser/ParserTestRunner.php +++ b/tests/parser/ParserTestRunner.php @@ -26,6 +26,8 @@ * @ingroup Testing */ +use MediaWiki\Context\IContextSource; +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Html\Html; use MediaWiki\Interwiki\ClassicInterwikiLookup; diff --git a/tests/phpunit/MediaWikiIntegrationTestCase.php b/tests/phpunit/MediaWikiIntegrationTestCase.php index 465df902b487..9d27c6fcff4a 100644 --- a/tests/phpunit/MediaWikiIntegrationTestCase.php +++ b/tests/phpunit/MediaWikiIntegrationTestCase.php @@ -4,6 +4,7 @@ use MediaWiki\Config\Config; use MediaWiki\Config\ConfigFactory; use MediaWiki\Config\HashConfig; use MediaWiki\Config\MultiConfig; +use MediaWiki\Context\RequestContext; use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\HookContainer\FauxGlobalHookArray; use MediaWiki\HookContainer\HookRunner; diff --git a/tests/phpunit/includes/Output/OutputPageTest.php b/tests/phpunit/includes/Output/OutputPageTest.php index 5457509dacc8..1b871df872b3 100644 --- a/tests/phpunit/includes/Output/OutputPageTest.php +++ b/tests/phpunit/includes/Output/OutputPageTest.php @@ -2,6 +2,7 @@ use MediaWiki\Config\HashConfig; use MediaWiki\Config\MultiConfig; +use MediaWiki\Context\RequestContext; use MediaWiki\Html\Html; use MediaWiki\Language\RawMessage; use MediaWiki\Languages\LanguageConverterFactory; diff --git a/tests/phpunit/includes/OutputTransform/DefaultOutputPipelineFactoryTest.php b/tests/phpunit/includes/OutputTransform/DefaultOutputPipelineFactoryTest.php index 0a7caebd5bea..2c7dd6affdbd 100644 --- a/tests/phpunit/includes/OutputTransform/DefaultOutputPipelineFactoryTest.php +++ b/tests/phpunit/includes/OutputTransform/DefaultOutputPipelineFactoryTest.php @@ -3,10 +3,10 @@ namespace MediaWiki\OutputTransform; use LogicException; +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Parser\ParserOutput; use MediaWikiLangTestCase; -use RequestContext; /** * @covers \MediaWiki\OutputTransform\DefaultOutputPipelineFactory diff --git a/tests/phpunit/includes/OutputTransform/OutputTransformStageTestBase.php b/tests/phpunit/includes/OutputTransform/OutputTransformStageTestBase.php index 34af547d0ea0..23446609a2e3 100644 --- a/tests/phpunit/includes/OutputTransform/OutputTransformStageTestBase.php +++ b/tests/phpunit/includes/OutputTransform/OutputTransformStageTestBase.php @@ -2,9 +2,9 @@ namespace MediaWiki\OutputTransform; +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWikiIntegrationTestCase; -use RequestContext; abstract class OutputTransformStageTestBase extends MediaWikiIntegrationTestCase { abstract public function createStage(): OutputTransformStage; diff --git a/tests/phpunit/includes/OutputTransform/Stages/ExecutePostCacheTransformHooksTest.php b/tests/phpunit/includes/OutputTransform/Stages/ExecutePostCacheTransformHooksTest.php index 331a61cfd3ac..20e878b936d7 100644 --- a/tests/phpunit/includes/OutputTransform/Stages/ExecutePostCacheTransformHooksTest.php +++ b/tests/phpunit/includes/OutputTransform/Stages/ExecutePostCacheTransformHooksTest.php @@ -2,10 +2,10 @@ namespace MediaWiki\OutputTransform\Stages; +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\OutputTransform\TestUtils; use MediaWiki\Parser\ParserOutput; -use RequestContext; /** * This test does not extend OutputTransformStageTestBase because we're explicitly testing that diff --git a/tests/phpunit/includes/Permissions/PermissionManagerTest.php b/tests/phpunit/includes/Permissions/PermissionManagerTest.php index bb4b70c303e5..3fadacd85893 100644 --- a/tests/phpunit/includes/Permissions/PermissionManagerTest.php +++ b/tests/phpunit/includes/Permissions/PermissionManagerTest.php @@ -11,6 +11,7 @@ use MediaWiki\Block\Restriction\NamespaceRestriction; use MediaWiki\Block\Restriction\PageRestriction; use MediaWiki\Block\SystemBlock; use MediaWiki\Cache\CacheKeyHelper; +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Permissions\PermissionManager; use MediaWiki\Request\FauxRequest; @@ -22,7 +23,6 @@ use MediaWiki\User\User; use MediaWiki\User\UserIdentityValue; use MediaWikiLangTestCase; use Message; -use RequestContext; use stdClass; use TestAllServiceOptionsUsed; use Wikimedia\ScopedCallback; diff --git a/tests/phpunit/includes/Request/ContentSecurityPolicyTest.php b/tests/phpunit/includes/Request/ContentSecurityPolicyTest.php index b362078393bb..8a83c408b47f 100644 --- a/tests/phpunit/includes/Request/ContentSecurityPolicyTest.php +++ b/tests/phpunit/includes/Request/ContentSecurityPolicyTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Request\ContentSecurityPolicy; use MediaWiki\Request\FauxResponse; diff --git a/tests/phpunit/includes/Rest/EntryPointTest.php b/tests/phpunit/includes/Rest/EntryPointTest.php index 48a80b646181..4b0486f16430 100644 --- a/tests/phpunit/includes/Rest/EntryPointTest.php +++ b/tests/phpunit/includes/Rest/EntryPointTest.php @@ -4,13 +4,13 @@ namespace MediaWiki\Tests\Rest; use GuzzleHttp\Psr7\Stream; use GuzzleHttp\Psr7\Uri; +use MediaWiki\Context\RequestContext; use MediaWiki\Request\WebResponse; use MediaWiki\Rest\CorsUtils; use MediaWiki\Rest\EntryPoint; use MediaWiki\Rest\Handler; use MediaWiki\Rest\RequestData; use MediaWiki\Rest\RequestInterface; -use RequestContext; /** * @covers \MediaWiki\Rest\EntryPoint diff --git a/tests/phpunit/includes/actions/ActionEntryPointTest.php b/tests/phpunit/includes/actions/ActionEntryPointTest.php index 244f124fa30a..080c97dd6f45 100644 --- a/tests/phpunit/includes/actions/ActionEntryPointTest.php +++ b/tests/phpunit/includes/actions/ActionEntryPointTest.php @@ -6,6 +6,7 @@ use BadTitleError; use DeferredUpdates; use DeferredUpdatesScopeStack; use MediaWiki\Actions\ActionEntryPoint; +use MediaWiki\Context\RequestContext; use MediaWiki\Deferred\DeferredUpdatesScopeMediaWikiStack; use MediaWiki\MainConfigNames; use MediaWiki\Request\FauxRequest; @@ -18,7 +19,6 @@ use MediaWiki\Title\Title; use MediaWikiIntegrationTestCase; use PHPUnit\Framework\Assert; use ReflectionMethod; -use RequestContext; use Wikimedia\TestingAccessWrapper; use WikiPage; diff --git a/tests/phpunit/includes/actions/ActionFactoryIntegrationTest.php b/tests/phpunit/includes/actions/ActionFactoryIntegrationTest.php index 6c571fe172e5..234248560638 100644 --- a/tests/phpunit/includes/actions/ActionFactoryIntegrationTest.php +++ b/tests/phpunit/includes/actions/ActionFactoryIntegrationTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\Actions\ActionFactory; +use MediaWiki\Context\RequestContext; use MediaWiki\MediaWikiServices; use MediaWiki\Title\Title; diff --git a/tests/phpunit/includes/actions/ActionTest.php b/tests/phpunit/includes/actions/ActionTest.php index ada2e76256ff..56eab99d62ba 100644 --- a/tests/phpunit/includes/actions/ActionTest.php +++ b/tests/phpunit/includes/actions/ActionTest.php @@ -1,6 +1,9 @@ <?php use MediaWiki\Block\DatabaseBlock; +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\IContextSource; +use MediaWiki\Context\RequestContext; use MediaWiki\DAO\WikiAwareEntity; use MediaWiki\MainConfigNames; use MediaWiki\Permissions\PermissionManager; diff --git a/tests/phpunit/includes/actions/RollbackActionTest.php b/tests/phpunit/includes/actions/RollbackActionTest.php index 57c643d92b28..69e0920507e1 100644 --- a/tests/phpunit/includes/actions/RollbackActionTest.php +++ b/tests/phpunit/includes/actions/RollbackActionTest.php @@ -3,14 +3,14 @@ namespace MediaWiki\Tests\Action; use Article; -use DerivativeContext; use ErrorPageError; +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\RequestContext; use MediaWiki\Request\FauxRequest; use MediaWiki\Request\WebRequest; use MediaWiki\Title\Title; use MediaWiki\User\User; use MediaWikiIntegrationTestCase; -use RequestContext; use RollbackAction; /** diff --git a/tests/phpunit/includes/actions/WatchActionTest.php b/tests/phpunit/includes/actions/WatchActionTest.php index 5c805cbdb35d..5b69c0f64ab5 100644 --- a/tests/phpunit/includes/actions/WatchActionTest.php +++ b/tests/phpunit/includes/actions/WatchActionTest.php @@ -1,5 +1,8 @@ <?php +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\IContextSource; +use MediaWiki\Context\RequestContext; use MediaWiki\Language\RawMessage; use MediaWiki\MainConfigNames; use MediaWiki\Output\OutputPage; diff --git a/tests/phpunit/includes/api/ApiBaseTest.php b/tests/phpunit/includes/api/ApiBaseTest.php index 3a7a4976a4e2..f20565295231 100644 --- a/tests/phpunit/includes/api/ApiBaseTest.php +++ b/tests/phpunit/includes/api/ApiBaseTest.php @@ -2,6 +2,8 @@ use MediaWiki\Api\Validator\SubmoduleDef; use MediaWiki\Block\DatabaseBlock; +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\RequestContext; use MediaWiki\MediaWikiServices; use MediaWiki\ParamValidator\TypeDef\NamespaceDef; use MediaWiki\Permissions\PermissionStatus; diff --git a/tests/phpunit/includes/api/ApiComparePagesTest.php b/tests/phpunit/includes/api/ApiComparePagesTest.php index 36e9f12867e7..64979198b94a 100644 --- a/tests/phpunit/includes/api/ApiComparePagesTest.php +++ b/tests/phpunit/includes/api/ApiComparePagesTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Title\Title; diff --git a/tests/phpunit/includes/api/ApiContinuationManagerTest.php b/tests/phpunit/includes/api/ApiContinuationManagerTest.php index 2d6113572b10..31decabb76af 100644 --- a/tests/phpunit/includes/api/ApiContinuationManagerTest.php +++ b/tests/phpunit/includes/api/ApiContinuationManagerTest.php @@ -1,5 +1,7 @@ <?php +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\RequestContext; use MediaWiki\Request\FauxRequest; /** diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php index a7a781c88413..300929d1e6d6 100644 --- a/tests/phpunit/includes/api/ApiEditPageTest.php +++ b/tests/phpunit/includes/api/ApiEditPageTest.php @@ -2,6 +2,7 @@ use MediaWiki\Block\DatabaseBlock; use MediaWiki\CommentStore\CommentStoreComment; +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Status\Status; diff --git a/tests/phpunit/includes/api/ApiMainTest.php b/tests/phpunit/includes/api/ApiMainTest.php index 88cb659203d3..6195d4744f4f 100644 --- a/tests/phpunit/includes/api/ApiMainTest.php +++ b/tests/phpunit/includes/api/ApiMainTest.php @@ -3,6 +3,7 @@ use MediaWiki\Config\Config; use MediaWiki\Config\HashConfig; use MediaWiki\Config\MultiConfig; +use MediaWiki\Context\RequestContext; use MediaWiki\Language\RawMessage; use MediaWiki\MainConfigNames; use MediaWiki\Permissions\Authority; diff --git a/tests/phpunit/includes/api/ApiOpenSearchTest.php b/tests/phpunit/includes/api/ApiOpenSearchTest.php index f69be4e7a8d5..4d65fb328eb5 100644 --- a/tests/phpunit/includes/api/ApiOpenSearchTest.php +++ b/tests/phpunit/includes/api/ApiOpenSearchTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use Wikimedia\ParamValidator\ParamValidator; /** diff --git a/tests/phpunit/includes/api/ApiOptionsTest.php b/tests/phpunit/includes/api/ApiOptionsTest.php index dd73bded3110..9a99ac6b14ae 100644 --- a/tests/phpunit/includes/api/ApiOptionsTest.php +++ b/tests/phpunit/includes/api/ApiOptionsTest.php @@ -1,5 +1,8 @@ <?php +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\IContextSource; +use MediaWiki\Context\RequestContext; use MediaWiki\Preferences\DefaultPreferencesFactory; use MediaWiki\Request\FauxRequest; use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait; diff --git a/tests/phpunit/includes/api/ApiPageSetTest.php b/tests/phpunit/includes/api/ApiPageSetTest.php index 53f15b237713..fd5378aba5ed 100644 --- a/tests/phpunit/includes/api/ApiPageSetTest.php +++ b/tests/phpunit/includes/api/ApiPageSetTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Linker\LinkTarget; use MediaWiki\MainConfigNames; use MediaWiki\Page\PageIdentity; diff --git a/tests/phpunit/includes/api/ApiPurgeTest.php b/tests/phpunit/includes/api/ApiPurgeTest.php index 3e262a0fba7c..3ab42316e81f 100644 --- a/tests/phpunit/includes/api/ApiPurgeTest.php +++ b/tests/phpunit/includes/api/ApiPurgeTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Permissions\Authority; use MediaWiki\Permissions\PermissionStatus; diff --git a/tests/phpunit/includes/api/ApiTestCase.php b/tests/phpunit/includes/api/ApiTestCase.php index ee1bf2d87448..5687d27b5f0b 100644 --- a/tests/phpunit/includes/api/ApiTestCase.php +++ b/tests/phpunit/includes/api/ApiTestCase.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\MediaWikiServices; use MediaWiki\Permissions\Authority; use MediaWiki\Request\FauxRequest; diff --git a/tests/phpunit/includes/api/ApiTestContext.php b/tests/phpunit/includes/api/ApiTestContext.php index 0ea64cc2e21a..43980d763694 100644 --- a/tests/phpunit/includes/api/ApiTestContext.php +++ b/tests/phpunit/includes/api/ApiTestContext.php @@ -1,5 +1,7 @@ <?php +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\RequestContext; use MediaWiki\Permissions\Authority; use MediaWiki\Request\WebRequest; diff --git a/tests/phpunit/includes/api/format/ApiFormatBaseTest.php b/tests/phpunit/includes/api/format/ApiFormatBaseTest.php index 71fbc08dc85e..8d0a1eaa6113 100644 --- a/tests/phpunit/includes/api/format/ApiFormatBaseTest.php +++ b/tests/phpunit/includes/api/format/ApiFormatBaseTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Request\FauxRequest; use Wikimedia\ParamValidator\ParamValidator; diff --git a/tests/phpunit/includes/api/format/ApiFormatTestBase.php b/tests/phpunit/includes/api/format/ApiFormatTestBase.php index 29592743606c..1d21ee7d9b15 100644 --- a/tests/phpunit/includes/api/format/ApiFormatTestBase.php +++ b/tests/phpunit/includes/api/format/ApiFormatTestBase.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Request\FauxRequest; abstract class ApiFormatTestBase extends MediaWikiIntegrationTestCase { diff --git a/tests/phpunit/includes/api/query/ApiQueryInfoTest.php b/tests/phpunit/includes/api/query/ApiQueryInfoTest.php index 466a3c68034f..cc61197d8e28 100644 --- a/tests/phpunit/includes/api/query/ApiQueryInfoTest.php +++ b/tests/phpunit/includes/api/query/ApiQueryInfoTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\Block\DatabaseBlock; +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Title\Title; use MediaWiki\User\User; diff --git a/tests/phpunit/includes/auth/AuthManagerTest.php b/tests/phpunit/includes/auth/AuthManagerTest.php index a238e62d68ca..37e722c282c4 100644 --- a/tests/phpunit/includes/auth/AuthManagerTest.php +++ b/tests/phpunit/includes/auth/AuthManagerTest.php @@ -16,6 +16,7 @@ use MediaWiki\Block\SystemBlock; use MediaWiki\Config\Config; use MediaWiki\Config\HashConfig; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\StaticHookRegistry; use MediaWiki\Languages\LanguageConverterFactory; @@ -747,7 +748,7 @@ class AuthManagerTest extends \MediaWikiIntegrationTestCase { ) { $this->setContentLang( $contLang ); $this->initializeManager( true ); - $context = \RequestContext::getMain(); + $context = RequestContext::getMain(); $reset = new ScopedCallback( [ $context, 'setLanguage' ], [ $context->getLanguage() ] ); $context->setLanguage( 'de' ); diff --git a/tests/phpunit/includes/auth/CheckBlocksSecondaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/CheckBlocksSecondaryAuthenticationProviderTest.php index 13aa1f587f96..7bf815cc7224 100644 --- a/tests/phpunit/includes/auth/CheckBlocksSecondaryAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/CheckBlocksSecondaryAuthenticationProviderTest.php @@ -4,12 +4,12 @@ namespace MediaWiki\Auth; use MediaWiki\Block\DatabaseBlock; use MediaWiki\Config\HashConfig; +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Request\FauxRequest; use MediaWiki\Tests\Unit\Auth\AuthenticationProviderTestTrait; use MediaWiki\User\User; use PHPUnit\Framework\MockObject\MockObject; -use RequestContext; use Wikimedia\TestingAccessWrapper; /** diff --git a/tests/phpunit/includes/block/BlockErrorFormatterTest.php b/tests/phpunit/includes/block/BlockErrorFormatterTest.php index 72493d8db242..cbd0ac057971 100644 --- a/tests/phpunit/includes/block/BlockErrorFormatterTest.php +++ b/tests/phpunit/includes/block/BlockErrorFormatterTest.php @@ -4,6 +4,9 @@ use MediaWiki\Block\BlockErrorFormatter; use MediaWiki\Block\CompositeBlock; use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\SystemBlock; +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\IContextSource; +use MediaWiki\Context\RequestContext; use Wikimedia\Rdbms\IDatabase; use Wikimedia\Rdbms\LBFactory; diff --git a/tests/phpunit/includes/changes/EnhancedChangesListTest.php b/tests/phpunit/includes/changes/EnhancedChangesListTest.php index 067879fea082..a7b53f283726 100644 --- a/tests/phpunit/includes/changes/EnhancedChangesListTest.php +++ b/tests/phpunit/includes/changes/EnhancedChangesListTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Title\Title; use MediaWiki\User\User; use MediaWiki\Utils\MWTimestamp; diff --git a/tests/phpunit/includes/changes/OldChangesListTest.php b/tests/phpunit/includes/changes/OldChangesListTest.php index 424577cecd2a..051b1fd330cc 100644 --- a/tests/phpunit/includes/changes/OldChangesListTest.php +++ b/tests/phpunit/includes/changes/OldChangesListTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Title\Title; diff --git a/tests/phpunit/includes/changes/TestRecentChangesHelper.php b/tests/phpunit/includes/changes/TestRecentChangesHelper.php index 0cd7b9ecae7c..05b0304f12cf 100644 --- a/tests/phpunit/includes/changes/TestRecentChangesHelper.php +++ b/tests/phpunit/includes/changes/TestRecentChangesHelper.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\MediaWikiServices; use MediaWiki\Title\Title; use MediaWiki\User\User; diff --git a/tests/phpunit/includes/content/ContentHandlerTest.php b/tests/phpunit/includes/content/ContentHandlerTest.php index 870da82e3f80..aef7ef09ad0c 100644 --- a/tests/phpunit/includes/content/ContentHandlerTest.php +++ b/tests/phpunit/includes/content/ContentHandlerTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\Content\ValidationParams; +use MediaWiki\Context\RequestContext; use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\Linker\LinkRenderer; use MediaWiki\MainConfigNames; diff --git a/tests/phpunit/includes/content/ContentModelChangeTest.php b/tests/phpunit/includes/content/ContentModelChangeTest.php index 41e142570091..6263cee2cf08 100644 --- a/tests/phpunit/includes/content/ContentModelChangeTest.php +++ b/tests/phpunit/includes/content/ContentModelChangeTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Page\PageIdentity; use MediaWiki\Permissions\Authority; use MediaWiki\Permissions\PermissionStatus; diff --git a/tests/phpunit/includes/content/FallbackContentHandlerTest.php b/tests/phpunit/includes/content/FallbackContentHandlerTest.php index 60d2492d6177..692bcb869060 100644 --- a/tests/phpunit/includes/content/FallbackContentHandlerTest.php +++ b/tests/phpunit/includes/content/FallbackContentHandlerTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Parser\ParserObserver; use MediaWiki\Request\FauxRequest; use MediaWiki\Title\Title; diff --git a/tests/phpunit/includes/content/TextContentTest.php b/tests/phpunit/includes/content/TextContentTest.php index ecb5f6bb7db2..eca9ce9af243 100644 --- a/tests/phpunit/includes/content/TextContentTest.php +++ b/tests/phpunit/includes/content/TextContentTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Title\Title; use MediaWiki\User\User; diff --git a/tests/phpunit/includes/debug/MWDebugTest.php b/tests/phpunit/includes/debug/MWDebugTest.php index 89941a25d102..06b2cdf7614c 100644 --- a/tests/phpunit/includes/debug/MWDebugTest.php +++ b/tests/phpunit/includes/debug/MWDebugTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Request\FauxRequest; use MediaWiki\Title\TitleValue; use Psr\Log\LoggerInterface; diff --git a/tests/phpunit/includes/diff/DifferenceEngineTest.php b/tests/phpunit/includes/diff/DifferenceEngineTest.php index 72b475971a8b..1f90d696a434 100644 --- a/tests/phpunit/includes/diff/DifferenceEngineTest.php +++ b/tests/phpunit/includes/diff/DifferenceEngineTest.php @@ -1,6 +1,8 @@ <?php use MediaWiki\Config\HashConfig; +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Output\OutputPage; use MediaWiki\Permissions\SimpleAuthority; diff --git a/tests/phpunit/includes/diff/TextDiffer/ManifoldTextDifferTest.php b/tests/phpunit/includes/diff/TextDiffer/ManifoldTextDifferTest.php index d882f539c51d..85571cf96cc3 100644 --- a/tests/phpunit/includes/diff/TextDiffer/ManifoldTextDifferTest.php +++ b/tests/phpunit/includes/diff/TextDiffer/ManifoldTextDifferTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Diff\TextDiffer\ManifoldTextDiffer; use MediaWiki\Tests\Diff\TextDiffer\TextDifferData; diff --git a/tests/phpunit/includes/diff/TextDiffer/PhpTextDifferTest.php b/tests/phpunit/includes/diff/TextDiffer/PhpTextDifferTest.php index b9380f6de1b6..e8009cb12b3a 100644 --- a/tests/phpunit/includes/diff/TextDiffer/PhpTextDifferTest.php +++ b/tests/phpunit/includes/diff/TextDiffer/PhpTextDifferTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Diff\TextDiffer\PhpTextDiffer; use MediaWiki\Tests\Diff\TextDiffer\TextDifferData; diff --git a/tests/phpunit/includes/diff/TextDiffer/Wikidiff2TextDifferTest.php b/tests/phpunit/includes/diff/TextDiffer/Wikidiff2TextDifferTest.php index 906346cdded4..2959f0ca8fc8 100644 --- a/tests/phpunit/includes/diff/TextDiffer/Wikidiff2TextDifferTest.php +++ b/tests/phpunit/includes/diff/TextDiffer/Wikidiff2TextDifferTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Diff\TextDiffer\TextDiffer; use MediaWiki\Diff\TextDiffer\Wikidiff2TextDiffer; use MediaWiki\Tests\Diff\TextDiffer\TextDifferData; diff --git a/tests/phpunit/includes/diff/TextSlotDiffRendererTest.php b/tests/phpunit/includes/diff/TextSlotDiffRendererTest.php index 43833c419e63..490ece22930c 100644 --- a/tests/phpunit/includes/diff/TextSlotDiffRendererTest.php +++ b/tests/phpunit/includes/diff/TextSlotDiffRendererTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Diff\TextDiffer\ManifoldTextDiffer; use MediaWiki\Diff\TextDiffer\Wikidiff2TextDiffer; use MediaWiki\Tests\Diff\TextDiffer\TextDifferData; diff --git a/tests/phpunit/includes/editpage/EditPageConstraintsTest.php b/tests/phpunit/includes/editpage/EditPageConstraintsTest.php index bffc35be16b5..04fdf75ce16a 100644 --- a/tests/phpunit/includes/editpage/EditPageConstraintsTest.php +++ b/tests/phpunit/includes/editpage/EditPageConstraintsTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\EditPage\EditPage; use MediaWiki\EditPage\SpamChecker; use MediaWiki\MainConfigNames; diff --git a/tests/phpunit/includes/editpage/EditPageTest.php b/tests/phpunit/includes/editpage/EditPageTest.php index b930919650ef..c2adb6bfc56c 100644 --- a/tests/phpunit/includes/editpage/EditPageTest.php +++ b/tests/phpunit/includes/editpage/EditPageTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\EditPage\EditPage; use MediaWiki\MainConfigNames; diff --git a/tests/phpunit/includes/exception/UserBlockedErrorTest.php b/tests/phpunit/includes/exception/UserBlockedErrorTest.php index 797dd07d6376..59bc1a05e629 100644 --- a/tests/phpunit/includes/exception/UserBlockedErrorTest.php +++ b/tests/phpunit/includes/exception/UserBlockedErrorTest.php @@ -2,6 +2,7 @@ use MediaWiki\Block\AbstractBlock; use MediaWiki\Block\BlockErrorFormatter; +use MediaWiki\Context\RequestContext; use MediaWiki\Language\FormatterFactory; use MediaWiki\Language\RawMessage; use MediaWiki\User\UserIdentity; diff --git a/tests/phpunit/includes/htmlform/HTMLFormFieldTest.php b/tests/phpunit/includes/htmlform/HTMLFormFieldTest.php index 592976394798..66349a538521 100644 --- a/tests/phpunit/includes/htmlform/HTMLFormFieldTest.php +++ b/tests/phpunit/includes/htmlform/HTMLFormFieldTest.php @@ -1,5 +1,7 @@ <?php +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\RequestContext; use MediaWiki\Request\FauxRequest; use MediaWiki\Status\Status; use MediaWiki\Title\Title; diff --git a/tests/phpunit/includes/htmlform/HTMLFormTest.php b/tests/phpunit/includes/htmlform/HTMLFormTest.php index c043d5ac9815..2899a2290ab9 100644 --- a/tests/phpunit/includes/htmlform/HTMLFormTest.php +++ b/tests/phpunit/includes/htmlform/HTMLFormTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\Config\HashConfig; +use MediaWiki\Context\RequestContext; use MediaWiki\Language\RawMessage; use MediaWiki\MainConfigNames; use MediaWiki\Output\OutputPage; diff --git a/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php b/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php index 7da0d677bf06..f6cf58b6de51 100644 --- a/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php +++ b/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Title\Title; /** diff --git a/tests/phpunit/includes/language/LanguageConverterTest.php b/tests/phpunit/includes/language/LanguageConverterTest.php index 8d0186be58ef..59d83686c10d 100644 --- a/tests/phpunit/includes/language/LanguageConverterTest.php +++ b/tests/phpunit/includes/language/LanguageConverterTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Linker\LinkTarget; use MediaWiki\MainConfigNames; use MediaWiki\Page\PageReference; diff --git a/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php b/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php index 1f617cc4b2a2..622085ac05ba 100644 --- a/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php +++ b/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php @@ -1,5 +1,7 @@ <?php +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\RequestContext; use MediaWiki\LinkedData\PageDataRequestHandler; use MediaWiki\MainConfigNames; use MediaWiki\Output\OutputPage; diff --git a/tests/phpunit/includes/linker/LinkerTest.php b/tests/phpunit/includes/linker/LinkerTest.php index 21b0561ed29b..a4fa69eaa8af 100644 --- a/tests/phpunit/includes/linker/LinkerTest.php +++ b/tests/phpunit/includes/linker/LinkerTest.php @@ -2,6 +2,7 @@ use MediaWiki\CommentStore\CommentStoreComment; use MediaWiki\Config\SiteConfiguration; +use MediaWiki\Context\RequestContext; use MediaWiki\Linker\Linker; use MediaWiki\MainConfigNames; use MediaWiki\Revision\MutableRevisionRecord; diff --git a/tests/phpunit/includes/logging/LogFormatterTest.php b/tests/phpunit/includes/logging/LogFormatterTest.php index 50cfe6df3b51..bd306a6ee186 100644 --- a/tests/phpunit/includes/logging/LogFormatterTest.php +++ b/tests/phpunit/includes/logging/LogFormatterTest.php @@ -1,5 +1,7 @@ <?php +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\RequestContext; use MediaWiki\Linker\Linker; use MediaWiki\MainConfigNames; use MediaWiki\Permissions\SimpleAuthority; diff --git a/tests/phpunit/includes/logging/LogFormatterTestCase.php b/tests/phpunit/includes/logging/LogFormatterTestCase.php index 2eefb2ae7f04..a9bb3d9938ef 100644 --- a/tests/phpunit/includes/logging/LogFormatterTestCase.php +++ b/tests/phpunit/includes/logging/LogFormatterTestCase.php @@ -1,6 +1,7 @@ <?php use MediaWiki\Config\ServiceOptions; +use MediaWiki\Context\RequestContext; use MediaWiki\Linker\LinkRenderer; use MediaWiki\Linker\LinkTarget; use MediaWiki\MediaWikiServices; diff --git a/tests/phpunit/includes/logging/ProtectLogFormatterTest.php b/tests/phpunit/includes/logging/ProtectLogFormatterTest.php index e43abe10069d..95618fc676d0 100644 --- a/tests/phpunit/includes/logging/ProtectLogFormatterTest.php +++ b/tests/phpunit/includes/logging/ProtectLogFormatterTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait; use MediaWiki\Title\Title; use MediaWiki\Title\TitleFactory; diff --git a/tests/phpunit/includes/page/ArticleTest.php b/tests/phpunit/includes/page/ArticleTest.php index e8a7d82c4442..9d3a8dc5375a 100644 --- a/tests/phpunit/includes/page/ArticleTest.php +++ b/tests/phpunit/includes/page/ArticleTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\MainConfigSchema; use MediaWiki\Page\ParserOutputAccess; diff --git a/tests/phpunit/includes/page/ArticleViewTest.php b/tests/phpunit/includes/page/ArticleViewTest.php index 90f507407a75..925094b790be 100644 --- a/tests/phpunit/includes/page/ArticleViewTest.php +++ b/tests/phpunit/includes/page/ArticleViewTest.php @@ -1,6 +1,8 @@ <?php use MediaWiki\CommentStore\CommentStoreComment; +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Output\OutputPage; use MediaWiki\Request\FauxRequest; diff --git a/tests/phpunit/includes/pager/HistoryPagerTest.php b/tests/phpunit/includes/pager/HistoryPagerTest.php index 8e572ede85dd..8041e671e2a2 100644 --- a/tests/phpunit/includes/pager/HistoryPagerTest.php +++ b/tests/phpunit/includes/pager/HistoryPagerTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Output\OutputPage; use MediaWiki\Pager\HistoryPager; use MediaWiki\Request\FauxRequest; diff --git a/tests/phpunit/includes/parser/ExtraParserTest.php b/tests/phpunit/includes/parser/ExtraParserTest.php index c978ab11c4b0..bce694113790 100644 --- a/tests/phpunit/includes/parser/ExtraParserTest.php +++ b/tests/phpunit/includes/parser/ExtraParserTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Interwiki\ClassicInterwikiLookup; use MediaWiki\MainConfigNames; use MediaWiki\SpecialPage\SpecialPage; diff --git a/tests/phpunit/includes/parser/ParserOptionsTest.php b/tests/phpunit/includes/parser/ParserOptionsTest.php index af88f5b0e897..1fe000dfb972 100644 --- a/tests/phpunit/includes/parser/ParserOptionsTest.php +++ b/tests/phpunit/includes/parser/ParserOptionsTest.php @@ -1,5 +1,7 @@ <?php +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookContainer; use MediaWiki\MainConfigNames; use MediaWiki\Revision\SlotRecord; diff --git a/tests/phpunit/includes/parser/ParserOutputTest.php b/tests/phpunit/includes/parser/ParserOutputTest.php index 6349c1727222..b63e87e07371 100644 --- a/tests/phpunit/includes/parser/ParserOutputTest.php +++ b/tests/phpunit/includes/parser/ParserOutputTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\ParserOutputStringSets; diff --git a/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php b/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php index 6663652d0749..f5f4294cdf95 100644 --- a/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php +++ b/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php @@ -4,6 +4,8 @@ use MediaWiki\Auth\AuthManager; use MediaWiki\Config\Config; use MediaWiki\Config\HashConfig; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Context\IContextSource; +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Languages\LanguageConverterFactory; diff --git a/tests/phpunit/includes/session/SessionBackendTest.php b/tests/phpunit/includes/session/SessionBackendTest.php index b6fb69765516..4315db409d42 100644 --- a/tests/phpunit/includes/session/SessionBackendTest.php +++ b/tests/phpunit/includes/session/SessionBackendTest.php @@ -4,6 +4,7 @@ namespace MediaWiki\Session; use MediaWiki\Config\Config; use MediaWiki\Config\HashConfig; +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookContainer; use MediaWiki\User\User; use MediaWikiIntegrationTestCase; @@ -868,7 +869,7 @@ class SessionBackendTest extends MediaWikiIntegrationTestCase { $resetSingleton = TestUtils::setSessionManagerSingleton( $this->manager ); $manager = TestingAccessWrapper::newFromObject( $this->manager ); - $request = \RequestContext::getMain()->getRequest(); + $request = RequestContext::getMain()->getRequest(); $manager->globalSession = $backend->getSession( $request ); $manager->globalSessionRequest = $request; @@ -907,7 +908,7 @@ class SessionBackendTest extends MediaWikiIntegrationTestCase { $resetSingleton = TestUtils::setSessionManagerSingleton( $this->manager ); $manager = TestingAccessWrapper::newFromObject( $this->manager ); - $request = \RequestContext::getMain()->getRequest(); + $request = RequestContext::getMain()->getRequest(); $manager->globalSession = $backend->getSession( $request ); $manager->globalSessionRequest = $request; @@ -944,7 +945,7 @@ class SessionBackendTest extends MediaWikiIntegrationTestCase { $resetSingleton = TestUtils::setSessionManagerSingleton( $this->manager ); $manager = TestingAccessWrapper::newFromObject( $this->manager ); - $request = \RequestContext::getMain()->getRequest(); + $request = RequestContext::getMain()->getRequest(); $manager->globalSession = $backend->getSession( $request ); $manager->globalSessionRequest = $request; diff --git a/tests/phpunit/includes/session/SessionManagerTest.php b/tests/phpunit/includes/session/SessionManagerTest.php index ea8d1375248e..6937c1330b61 100644 --- a/tests/phpunit/includes/session/SessionManagerTest.php +++ b/tests/phpunit/includes/session/SessionManagerTest.php @@ -3,6 +3,7 @@ namespace MediaWiki\Session; use MediaWiki\Config\HashConfig; +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWikiIntegrationTestCase; use Psr\Log\LoggerInterface; @@ -69,7 +70,7 @@ class SessionManagerTest extends MediaWikiIntegrationTestCase { } public function testGetGlobalSession() { - $context = \RequestContext::getMain(); + $context = RequestContext::getMain(); if ( !PHPSessionHandler::isInstalled() ) { PHPSessionHandler::install( SessionManager::singleton() ); diff --git a/tests/phpunit/includes/skins/SkinMustacheTest.php b/tests/phpunit/includes/skins/SkinMustacheTest.php index eb69ecd8b5bf..af2af3295139 100644 --- a/tests/phpunit/includes/skins/SkinMustacheTest.php +++ b/tests/phpunit/includes/skins/SkinMustacheTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Output\OutputPage; use MediaWiki\Request\ContentSecurityPolicy; diff --git a/tests/phpunit/includes/skins/SkinTest.php b/tests/phpunit/includes/skins/SkinTest.php index 784f02b72546..8ec0f6976ca8 100644 --- a/tests/phpunit/includes/skins/SkinTest.php +++ b/tests/phpunit/includes/skins/SkinTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Linker\LinkTarget; use MediaWiki\MainConfigNames; use MediaWiki\Page\PageReferenceValue; diff --git a/tests/phpunit/includes/specialpage/AbstractChangesListSpecialPageTestCase.php b/tests/phpunit/includes/specialpage/AbstractChangesListSpecialPageTestCase.php index 114ce8aaa8c6..9705cbe2acdf 100644 --- a/tests/phpunit/includes/specialpage/AbstractChangesListSpecialPageTestCase.php +++ b/tests/phpunit/includes/specialpage/AbstractChangesListSpecialPageTestCase.php @@ -1,5 +1,7 @@ <?php +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookContainer; use MediaWiki\Html\FormOptions; use MediaWiki\MainConfigNames; diff --git a/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php b/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php index 71655adc2cec..3f8f214cac14 100644 --- a/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php +++ b/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Request\FauxRequest; use MediaWiki\SpecialPage\ChangesListSpecialPage; diff --git a/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php b/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php index 140063d16cb2..aca59b2ce5de 100644 --- a/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php +++ b/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\MainConfigSchema; use MediaWiki\Output\OutputPage; diff --git a/tests/phpunit/includes/specials/ContribsPagerTest.php b/tests/phpunit/includes/specials/ContribsPagerTest.php index ed22d42df0e0..4875fae7ccb9 100644 --- a/tests/phpunit/includes/specials/ContribsPagerTest.php +++ b/tests/phpunit/includes/specials/ContribsPagerTest.php @@ -3,6 +3,7 @@ use MediaWiki\Cache\LinkBatchFactory; use MediaWiki\CommentFormatter\CommentFormatter; use MediaWiki\Config\HashConfig; +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookContainer; use MediaWiki\Linker\LinkRenderer; use MediaWiki\MainConfigNames; diff --git a/tests/phpunit/includes/specials/Contribute/ContributeFactoryTest.php b/tests/phpunit/includes/specials/Contribute/ContributeFactoryTest.php index f5719ece20d9..4340a929902a 100644 --- a/tests/phpunit/includes/specials/Contribute/ContributeFactoryTest.php +++ b/tests/phpunit/includes/specials/Contribute/ContributeFactoryTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookRunner; use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\Specials\Contribute\Card\ContributeCard; diff --git a/tests/phpunit/includes/specials/DeletedContribsPagerTest.php b/tests/phpunit/includes/specials/DeletedContribsPagerTest.php index 690b2f4cdff0..76a77f6c373d 100644 --- a/tests/phpunit/includes/specials/DeletedContribsPagerTest.php +++ b/tests/phpunit/includes/specials/DeletedContribsPagerTest.php @@ -2,6 +2,7 @@ use MediaWiki\Cache\LinkBatchFactory; use MediaWiki\CommentFormatter\CommentFormatter; +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookContainer; use MediaWiki\Linker\LinkRenderer; use MediaWiki\Pager\DeletedContribsPager; diff --git a/tests/phpunit/includes/specials/ImageListPagerTest.php b/tests/phpunit/includes/specials/ImageListPagerTest.php index 38c06cac7321..26eb129b57da 100644 --- a/tests/phpunit/includes/specials/ImageListPagerTest.php +++ b/tests/phpunit/includes/specials/ImageListPagerTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Pager\ImageListPager; /** diff --git a/tests/phpunit/includes/specials/SpecialBlockTest.php b/tests/phpunit/includes/specials/SpecialBlockTest.php index a913f3d56ec8..cb275b4cbe5e 100644 --- a/tests/phpunit/includes/specials/SpecialBlockTest.php +++ b/tests/phpunit/includes/specials/SpecialBlockTest.php @@ -5,6 +5,8 @@ use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\Restriction\ActionRestriction; use MediaWiki\Block\Restriction\NamespaceRestriction; use MediaWiki\Block\Restriction\PageRestriction; +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Request\FauxRequest; use MediaWiki\Specials\SpecialBlock; diff --git a/tests/phpunit/includes/specials/SpecialGoToInterwikiTest.php b/tests/phpunit/includes/specials/SpecialGoToInterwikiTest.php index 400dd02ed2f6..6e67b2d1221e 100644 --- a/tests/phpunit/includes/specials/SpecialGoToInterwikiTest.php +++ b/tests/phpunit/includes/specials/SpecialGoToInterwikiTest.php @@ -1,5 +1,7 @@ <?php +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\RequestContext; use MediaWiki\Interwiki\InterwikiLookupAdapter; use MediaWiki\Site\HashSiteStore; use MediaWiki\Title\Title; diff --git a/tests/phpunit/includes/specials/SpecialLogTest.php b/tests/phpunit/includes/specials/SpecialLogTest.php index 42117f079eb9..9d32906fc9eb 100644 --- a/tests/phpunit/includes/specials/SpecialLogTest.php +++ b/tests/phpunit/includes/specials/SpecialLogTest.php @@ -4,6 +4,7 @@ * @author Legoktm */ +use MediaWiki\Context\RequestContext; use MediaWiki\Request\FauxRequest; use MediaWiki\Revision\RevisionRecord; use MediaWiki\SpecialPage\SpecialPage; diff --git a/tests/phpunit/includes/specials/SpecialMIMESearchTest.php b/tests/phpunit/includes/specials/SpecialMIMESearchTest.php index 9b51509d0e30..f9adbe59a2f6 100644 --- a/tests/phpunit/includes/specials/SpecialMIMESearchTest.php +++ b/tests/phpunit/includes/specials/SpecialMIMESearchTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Request\FauxRequest; use MediaWiki\Specials\SpecialMIMESearch; use MediaWiki\Title\Title; diff --git a/tests/phpunit/includes/specials/SpecialMyLanguageTest.php b/tests/phpunit/includes/specials/SpecialMyLanguageTest.php index efd7d04e8a70..af0a02ab63ad 100644 --- a/tests/phpunit/includes/specials/SpecialMyLanguageTest.php +++ b/tests/phpunit/includes/specials/SpecialMyLanguageTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Specials\SpecialMyLanguage; use MediaWiki\Specials\SpecialPageLanguage; diff --git a/tests/phpunit/includes/specials/SpecialPageExecutor.php b/tests/phpunit/includes/specials/SpecialPageExecutor.php index 3b0f8c904150..bce67a8539b5 100644 --- a/tests/phpunit/includes/specials/SpecialPageExecutor.php +++ b/tests/phpunit/includes/specials/SpecialPageExecutor.php @@ -1,5 +1,7 @@ <?php +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\RequestContext; use MediaWiki\Output\OutputPage; use MediaWiki\Permissions\Authority; use MediaWiki\Request\FauxRequest; diff --git a/tests/phpunit/includes/specials/SpecialRecentChangesTest.php b/tests/phpunit/includes/specials/SpecialRecentChangesTest.php index ed9cd26ff378..01ffa85b1062 100644 --- a/tests/phpunit/includes/specials/SpecialRecentChangesTest.php +++ b/tests/phpunit/includes/specials/SpecialRecentChangesTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Request\FauxRequest; use MediaWiki\Specials\SpecialRecentChanges; diff --git a/tests/phpunit/includes/specials/SpecialSearchTest.php b/tests/phpunit/includes/specials/SpecialSearchTest.php index 3e7a8105f55a..1455f2865feb 100644 --- a/tests/phpunit/includes/specials/SpecialSearchTest.php +++ b/tests/phpunit/includes/specials/SpecialSearchTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Languages\LanguageConverterFactory; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; diff --git a/tests/phpunit/includes/specials/SpecialUncategorizedCategoriesTest.php b/tests/phpunit/includes/specials/SpecialUncategorizedCategoriesTest.php index ad0b4b4927b2..be4cf3772e2a 100644 --- a/tests/phpunit/includes/specials/SpecialUncategorizedCategoriesTest.php +++ b/tests/phpunit/includes/specials/SpecialUncategorizedCategoriesTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Language\RawMessage; use MediaWiki\Specials\SpecialUncategorizedCategories; use Wikimedia\Rdbms\Expression; diff --git a/tests/phpunit/includes/specials/SpecialUserLogoutTest.php b/tests/phpunit/includes/specials/SpecialUserLogoutTest.php index ad85f570bde5..f019650e3ca8 100644 --- a/tests/phpunit/includes/specials/SpecialUserLogoutTest.php +++ b/tests/phpunit/includes/specials/SpecialUserLogoutTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Request\FauxRequest; use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\Specials\SpecialUserLogout; diff --git a/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php b/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php index 961c15d1351b..5b8f5b015d06 100644 --- a/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php +++ b/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php @@ -10,6 +10,7 @@ use MediaWiki\Block\Restriction\PageRestriction; use MediaWiki\Cache\LinkBatchFactory; use MediaWiki\CommentFormatter\RowCommentFormatter; use MediaWiki\CommentStore\CommentStore; +use MediaWiki\Context\RequestContext; use MediaWiki\Linker\LinkRenderer; use MediaWiki\MainConfigNames; use MediaWiki\Pager\BlockListPager; diff --git a/tests/phpunit/includes/user/UserGroupManagerTest.php b/tests/phpunit/includes/user/UserGroupManagerTest.php index 22c391dc51ff..a595209bb0ca 100644 --- a/tests/phpunit/includes/user/UserGroupManagerTest.php +++ b/tests/phpunit/includes/user/UserGroupManagerTest.php @@ -25,6 +25,7 @@ use LogEntryBase; use MediaWiki\Block\DatabaseBlock; use MediaWiki\Config\ServiceOptions; use MediaWiki\Config\SiteConfiguration; +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Permissions\SimpleAuthority; use MediaWiki\Request\WebRequest; @@ -40,7 +41,6 @@ use MediaWiki\Utils\MWTimestamp; use MediaWikiIntegrationTestCase; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\Rule\InvokedCount; -use RequestContext; use TestLogger; use Wikimedia\Assert\PreconditionException; diff --git a/tests/phpunit/includes/user/UserTest.php b/tests/phpunit/includes/user/UserTest.php index 9a1d0842ca13..3a1057903ceb 100644 --- a/tests/phpunit/includes/user/UserTest.php +++ b/tests/phpunit/includes/user/UserTest.php @@ -5,6 +5,7 @@ use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\Restriction\NamespaceRestriction; use MediaWiki\Block\Restriction\PageRestriction; use MediaWiki\Block\SystemBlock; +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Permissions\RateLimiter; use MediaWiki\Permissions\RateLimitSubject; diff --git a/tests/phpunit/integration/includes/Rest/Handler/MediaFileHandlerTest.php b/tests/phpunit/integration/includes/Rest/Handler/MediaFileHandlerTest.php index 695d5517a844..af8a562f93e3 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/MediaFileHandlerTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/MediaFileHandlerTest.php @@ -2,12 +2,12 @@ namespace MediaWiki\Tests\Rest\Handler; +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Rest\Handler\MediaFileHandler; use MediaWiki\Rest\LocalizedHttpException; use MediaWiki\Rest\RequestData; use MediaWiki\Title\Title; -use RequestContext; use Wikimedia\Message\MessageValue; /** diff --git a/tests/phpunit/integration/includes/Rest/Handler/MediaLinksHandlerTest.php b/tests/phpunit/integration/includes/Rest/Handler/MediaLinksHandlerTest.php index a454cf99e386..5b0137a9006d 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/MediaLinksHandlerTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/MediaLinksHandlerTest.php @@ -2,12 +2,12 @@ namespace MediaWiki\Tests\Rest\Handler; +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Rest\Handler\MediaLinksHandler; use MediaWiki\Rest\LocalizedHttpException; use MediaWiki\Rest\RequestData; use MediaWiki\Title\Title; -use RequestContext; use Wikimedia\Message\MessageValue; /** diff --git a/tests/phpunit/integration/includes/Rest/Handler/RootSpecHandlerTest.php b/tests/phpunit/integration/includes/Rest/Handler/RootSpecHandlerTest.php index 013d96685206..7cf05d166039 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/RootSpecHandlerTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/RootSpecHandlerTest.php @@ -4,6 +4,7 @@ namespace MediaWiki\Tests\Rest\Handler; use MediaWiki\Config\HashConfig; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Rest\BasicAccess\StaticBasicAuthorizer; use MediaWiki\Rest\Handler\RootSpecHandler; @@ -14,7 +15,6 @@ use MediaWiki\Rest\ResponseFactory; use MediaWiki\Rest\Router; use MediaWiki\Rest\Validator\Validator; use MediaWikiIntegrationTestCase; -use RequestContext; use Wikimedia\Message\ITextFormatter; use Wikimedia\Message\MessageValue; diff --git a/tests/phpunit/integration/includes/Storage/UndoIntegrationTest.php b/tests/phpunit/integration/includes/Storage/UndoIntegrationTest.php index 4a62ad34f048..a78e46237842 100644 --- a/tests/phpunit/integration/includes/Storage/UndoIntegrationTest.php +++ b/tests/phpunit/integration/includes/Storage/UndoIntegrationTest.php @@ -4,6 +4,7 @@ namespace MediaWiki\Tests\Storage; use Article; use McrUndoAction; +use MediaWiki\Context\RequestContext; use MediaWiki\EditPage\EditPage; use MediaWiki\Output\OutputPage; use MediaWiki\Request\FauxRequest; @@ -13,7 +14,6 @@ use MediaWiki\Storage\EditResult; use MediaWiki\Title\Title; use MediaWiki\User\User; use MediaWikiIntegrationTestCase; -use RequestContext; use WikiPage; use WikitextContent; diff --git a/tests/phpunit/integration/includes/context/DerivativeContextTest.php b/tests/phpunit/integration/includes/context/DerivativeContextTest.php index 232885dc653c..f7d9571cb8cf 100644 --- a/tests/phpunit/integration/includes/context/DerivativeContextTest.php +++ b/tests/phpunit/integration/includes/context/DerivativeContextTest.php @@ -2,18 +2,18 @@ namespace MediaWiki\Tests\Integration\Context; -use DerivativeContext; -use IContextSource; use Language; use MediaWiki\Actions\ActionFactory; use MediaWiki\Config\HashConfig; +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\IContextSource; +use MediaWiki\Context\RequestContext; use MediaWiki\Output\OutputPage; use MediaWiki\Permissions\Authority; use MediaWiki\Request\FauxRequest; use MediaWiki\Title\Title; use MediaWiki\User\User; use MediaWikiIntegrationTestCase; -use RequestContext; use WikiPage; /** diff --git a/tests/phpunit/integration/includes/context/RequestContextTest.php b/tests/phpunit/integration/includes/context/RequestContextTest.php index 4fec29ec3d8f..631c3669c0d9 100644 --- a/tests/phpunit/integration/includes/context/RequestContextTest.php +++ b/tests/phpunit/integration/includes/context/RequestContextTest.php @@ -4,6 +4,7 @@ namespace MediaWiki\Tests\Integration\Context; use LogicException; use MediaWiki\Actions\ActionFactory; +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Permissions\UltimateAuthority; use MediaWiki\Request\FauxRequest; @@ -14,7 +15,6 @@ use MediaWiki\User\Options\StaticUserOptionsLookup; use MediaWiki\User\User; use MediaWiki\User\UserIdentityValue; use MediaWikiIntegrationTestCase; -use RequestContext; use Skin; use SkinFallback; @@ -26,7 +26,7 @@ use SkinFallback; class RequestContextTest extends MediaWikiIntegrationTestCase { /** - * @covers \RequestContext::sanitizeLangCode + * @covers \MediaWiki\Context\RequestContext::sanitizeLangCode * * @dataProvider provideSanitizeLangCode */ diff --git a/tests/phpunit/integration/includes/editpage/Constraint/EditFilterMergedContentHookConstraintTest.php b/tests/phpunit/integration/includes/editpage/Constraint/EditFilterMergedContentHookConstraintTest.php index 7e67a55cc572..dfe3793f5a0c 100644 --- a/tests/phpunit/integration/includes/editpage/Constraint/EditFilterMergedContentHookConstraintTest.php +++ b/tests/phpunit/integration/includes/editpage/Constraint/EditFilterMergedContentHookConstraintTest.php @@ -18,6 +18,7 @@ * @file */ +use MediaWiki\Context\RequestContext; use MediaWiki\EditPage\Constraint\EditFilterMergedContentHookConstraint; use MediaWiki\EditPage\Constraint\IEditConstraint; use MediaWiki\HookContainer\HookContainer; diff --git a/tests/phpunit/maintenance/PageDumpTestDataTrait.php b/tests/phpunit/maintenance/PageDumpTestDataTrait.php index 0f27b3362633..68791bef237a 100644 --- a/tests/phpunit/maintenance/PageDumpTestDataTrait.php +++ b/tests/phpunit/maintenance/PageDumpTestDataTrait.php @@ -3,11 +3,11 @@ namespace MediaWiki\Tests\Maintenance; use Exception; +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; use MediaWiki\Title\Title; -use RequestContext; use RevisionDeleter; use RuntimeException; use Wikimedia\Rdbms\IDatabase; diff --git a/tests/phpunit/mocks/MockEnvironment.php b/tests/phpunit/mocks/MockEnvironment.php index 8aa23b650341..abae651cf854 100644 --- a/tests/phpunit/mocks/MockEnvironment.php +++ b/tests/phpunit/mocks/MockEnvironment.php @@ -4,12 +4,12 @@ namespace MediaWiki\Tests; use Exception; use HashConfig; +use MediaWiki\Context\RequestContext; use MediaWiki\EntryPointEnvironment; use MediaWiki\Request\FauxRequest; use MediaWiki\Request\FauxResponse; use MultiConfig; use PHPUnit\Framework\Assert; -use RequestContext; /** * @internal For testing MediaWikiEntryPoint subclasses. diff --git a/tests/phpunit/mocks/permissions/MockAuthorityTrait.php b/tests/phpunit/mocks/permissions/MockAuthorityTrait.php index b387890d74a4..c1094ff55360 100644 --- a/tests/phpunit/mocks/permissions/MockAuthorityTrait.php +++ b/tests/phpunit/mocks/permissions/MockAuthorityTrait.php @@ -2,11 +2,11 @@ namespace MediaWiki\Tests\Unit\Permissions; -use IContextSource; use Language; use MediaWiki\Block\Block; use MediaWiki\Block\BlockErrorFormatter; use MediaWiki\Block\SystemBlock; +use MediaWiki\Context\IContextSource; use MediaWiki\Permissions\Authority; use MediaWiki\Permissions\PermissionManager; use MediaWiki\Permissions\RateLimiter; diff --git a/tests/phpunit/structure/ApiStructureTest.php b/tests/phpunit/structure/ApiStructureTest.php index bda2d92e2959..43a426a66d5a 100644 --- a/tests/phpunit/structure/ApiStructureTest.php +++ b/tests/phpunit/structure/ApiStructureTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\MainConfigNames; use MediaWiki\Title\Title; use Wikimedia\TestingAccessWrapper; diff --git a/tests/phpunit/structure/RestStructureTest.php b/tests/phpunit/structure/RestStructureTest.php index f75fe0d864fd..ebaa5ba90420 100644 --- a/tests/phpunit/structure/RestStructureTest.php +++ b/tests/phpunit/structure/RestStructureTest.php @@ -1,6 +1,8 @@ <?php use MediaWiki\Config\HashConfig; +use MediaWiki\Context\DerivativeContext; +use MediaWiki\Context\RequestContext; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\StaticHookRegistry; use MediaWiki\MainConfigSchema; diff --git a/tests/phpunit/unit/includes/Rest/Handler/ActionModuleBasedHandlerTestTrait.php b/tests/phpunit/unit/includes/Rest/Handler/ActionModuleBasedHandlerTestTrait.php index b1768af64e3b..6e948a8b4680 100644 --- a/tests/phpunit/unit/includes/Rest/Handler/ActionModuleBasedHandlerTestTrait.php +++ b/tests/phpunit/unit/includes/Rest/Handler/ActionModuleBasedHandlerTestTrait.php @@ -6,10 +6,10 @@ use ApiBase; use ApiMain; use Exception; use Language; +use MediaWiki\Context\RequestContext; use MediaWiki\Request\FauxRequest; use PHPUnit\Framework\MockObject\MockBuilder; use PHPUnit\Framework\MockObject\MockObject; -use RequestContext; /** * A trait providing utility functions for testing Handler classes diff --git a/tests/phpunit/unit/includes/actions/ViewActionTest.php b/tests/phpunit/unit/includes/actions/ViewActionTest.php index 0c879f171992..d73e8bf7b175 100644 --- a/tests/phpunit/unit/includes/actions/ViewActionTest.php +++ b/tests/phpunit/unit/includes/actions/ViewActionTest.php @@ -1,5 +1,7 @@ <?php +use MediaWiki\Context\RequestContext; + /** * @covers \ViewAction * diff --git a/tests/phpunit/unit/includes/api/ApiModuleManagerTest.php b/tests/phpunit/unit/includes/api/ApiModuleManagerTest.php index fcea2e2d2019..78ff076ca6cc 100644 --- a/tests/phpunit/unit/includes/api/ApiModuleManagerTest.php +++ b/tests/phpunit/unit/includes/api/ApiModuleManagerTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Context\RequestContext; use MediaWiki\Tests\Unit\DummyServicesTrait; use MediaWiki\User\UserFactory; diff --git a/thumb.php b/thumb.php index 6b6aa8c6860f..784db16e47a3 100644 --- a/thumb.php +++ b/thumb.php @@ -26,6 +26,7 @@ * @ingroup Media */ +use MediaWiki\Context\RequestContext; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MediaWikiServices; use MediaWiki\Permissions\PermissionStatus; |