From 4bae64d1c7f9e62d0f0953e124493ed76c7f7da7 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Thu, 8 Feb 2024 09:56:54 -0500 Subject: [PATCH] Namespace includes/context Bug: T353458 Change-Id: I4dbef138fd0110c14c70214282519189d70c94fb --- RELEASE-NOTES-1.42 | 6 +++++ api.php | 1 + autoload.php | 5 ++++ img_auth.php | 1 + includes/Category/CategoryViewer.php | 4 +-- includes/Feed/FeedUtils.php | 4 +-- includes/Hook/EditFilterMergedContentHook.php | 2 +- includes/HookContainer/HookRunner.php | 2 +- includes/MediaWiki.php | 2 ++ includes/MediaWikiEntryPoint.php | 2 +- includes/Output/IframeSandbox.php | 4 +-- includes/Output/IframeSandboxFactory.php | 2 +- includes/Output/OutputPage.php | 6 ++--- .../Stages/HandleSectionLinks.php | 2 +- .../Stages/HandleTOCMarkers.php | 2 +- includes/Permissions/PermissionManager.php | 4 +-- includes/Permissions/UserAuthority.php | 2 +- includes/Rest/EntryPoint.php | 4 +-- .../Rest/Handler/ActionModuleBasedHandler.php | 2 +- includes/Rest/Handler/ParsoidHandler.php | 4 +-- includes/Rest/Handler/SearchHandler.php | 2 +- includes/Revision/ContributionsLookup.php | 4 +-- includes/ServiceWiring.php | 1 + includes/Setup.php | 1 + includes/Status/Status.php | 4 +-- includes/StubObject/StubUserLang.php | 2 +- includes/WebStart.php | 5 ++-- includes/actions/Action.php | 1 + includes/actions/ActionEntryPoint.php | 2 +- includes/actions/ActionFactory.php | 4 +-- includes/actions/CreditsAction.php | 1 + includes/actions/DeleteAction.php | 1 + includes/actions/FileDeleteAction.php | 2 +- includes/actions/Hook/GetActionNameHook.php | 2 +- .../actions/Hook/HistoryPageToolLinksHook.php | 2 +- includes/actions/Hook/InfoActionHook.php | 2 +- .../Hook/PageHistoryBeforeListHook.php | 2 +- includes/actions/InfoAction.php | 1 + includes/actions/MarkpatrolledAction.php | 1 + includes/actions/McrUndoAction.php | 1 + includes/actions/RawAction.php | 1 + includes/actions/RevertAction.php | 1 + includes/actions/RollbackAction.php | 1 + includes/actions/UnwatchAction.php | 1 + includes/actions/WatchAction.php | 1 + includes/api/ApiBase.php | 2 ++ includes/api/ApiEditPage.php | 1 + includes/api/ApiEntryPoint.php | 2 +- includes/api/ApiHelp.php | 2 ++ includes/api/ApiMain.php | 3 +++ includes/api/ApiModuleManager.php | 1 + includes/api/ApiParamInfo.php | 1 + .../ApiFeedContributions__feedItemHook.php | 2 +- includes/api/Hook/ApiFormatHighlightHook.php | 2 +- includes/api/SearchApi.php | 1 + includes/auth/AuthManager.php | 5 ++-- includes/block/AbstractBlock.php | 2 +- includes/cache/GenderCache.php | 1 + includes/cache/HTMLFileCache.php | 1 + .../Hook/HTMLFileCache__useFileCacheHook.php | 2 +- includes/changes/ChangesList.php | 3 +++ includes/changes/ChangesListFilter.php | 1 + includes/changes/EnhancedChangesList.php | 1 + includes/changes/RCCacheEntryFactory.php | 1 + includes/changetags/ChangeTags.php | 2 ++ includes/changetags/ChangeTagsList.php | 1 + includes/content/ContentHandler.php | 2 ++ includes/content/ContentModelChange.php | 3 +++ includes/content/FallbackContentHandler.php | 1 + .../content/Hook/GetDifferenceEngineHook.php | 2 +- .../content/Hook/GetSlotDiffRendererHook.php | 2 +- includes/content/WikitextContent.php | 1 + includes/context/ContextSource.php | 11 ++++++++ includes/context/DerivativeContext.php | 11 ++++++++ .../Hook/RequestContextCreateSkinHook.php | 2 +- .../Hook/UserGetLanguageObjectHook.php | 2 +- includes/context/IContextSource.php | 8 ++++++ includes/context/MutableContext.php | 8 ++++++ includes/context/RequestContext.php | 27 +++++++++++++++---- includes/debug/MWDebug.php | 1 + includes/diff/DifferenceEngine.php | 2 ++ .../TextSlotDiffRendererTablePrefixHook.php | 2 +- includes/diff/SlotDiffRenderer.php | 1 + includes/diff/TextSlotDiffRenderer.php | 2 ++ .../Constraint/EditConstraintFactory.php | 2 +- .../EditFilterMergedContentHookConstraint.php | 2 +- includes/editpage/EditPage.php | 4 +-- includes/editpage/ParametersHelper.php | 2 +- .../editpage/TemplatesOnThisPageFormatter.php | 2 +- includes/exception/MWExceptionRenderer.php | 1 + includes/exception/PermissionsError.php | 1 + includes/exception/UserBlockedError.php | 1 + includes/exception/UserNotLoggedIn.php | 1 + includes/filerepo/FileRepo.php | 1 + includes/filerepo/LocalRepo.php | 1 + includes/filerepo/file/File.php | 1 + includes/filerepo/file/LocalFile.php | 1 + includes/gallery/ImageGalleryBase.php | 3 +++ includes/gallery/PackedImageGallery.php | 2 ++ includes/gallery/SlideshowImageGallery.php | 2 ++ includes/htmlform/HTMLForm.php | 2 ++ includes/htmlform/HTMLFormField.php | 1 + includes/htmlform/fields/HTMLButtonField.php | 1 + .../htmlform/fields/HTMLTimezoneField.php | 1 + .../import/ImportableOldRevisionImporter.php | 1 + includes/import/WikiImporterFactory.php | 1 + includes/installer/CliInstaller.php | 2 +- includes/installer/Installer.php | 2 +- includes/installer/WebInstaller.php | 2 +- .../jobqueue/jobs/AssembleUploadChunksJob.php | 1 + .../jobqueue/jobs/PublishStashedFileJob.php | 1 + includes/language/Language.php | 1 + includes/language/LanguageConverter.php | 1 + includes/language/Message.php | 2 ++ includes/language/MessageCache.php | 1 + includes/linker/DummyLinker.php | 2 +- .../Hook/LinkerGenerateRollbackLinkHook.php | 2 +- includes/linker/Linker.php | 8 +++--- includes/logging/LogEventsList.php | 3 +++ includes/logging/LogFormatter.php | 2 ++ includes/logging/LogPage.php | 1 + includes/logging/ManualLogEntry.php | 1 + includes/media/FormatMetadata.php | 2 ++ .../media/Hook/GetExtendedMetadataHook.php | 2 +- includes/page/Article.php | 2 ++ includes/page/Hook/ArticleFromTitleHook.php | 2 +- includes/page/ImageHistoryList.php | 1 + includes/page/MovePage.php | 2 +- includes/page/ProtectionForm.php | 2 +- includes/pager/IndexPager.php | 4 +-- includes/pager/TablePager.php | 2 +- includes/parser/Parser.php | 1 + includes/parser/ParserOptions.php | 1 + .../preferences/DefaultPreferencesFactory.php | 2 +- includes/preferences/PreferencesFactory.php | 2 +- includes/revisiondelete/RevDelArchiveList.php | 1 + .../revisiondelete/RevDelArchivedFileList.php | 1 + includes/revisiondelete/RevDelFileList.php | 1 + includes/revisiondelete/RevDelList.php | 1 + includes/revisiondelete/RevDelLogList.php | 1 + .../revisiondelete/RevDelRevisionList.php | 1 + includes/revisiondelete/RevisionDeleter.php | 1 + includes/revisionlist/RevisionItem.php | 1 + includes/revisionlist/RevisionListBase.php | 2 ++ includes/session/SessionManager.php | 3 ++- includes/session/SessionProvider.php | 2 +- .../skins/Hook/UndeletePageToolLinksHook.php | 2 +- includes/skins/Skin.php | 1 + .../SkinComponentRegistryContext.php | 2 +- .../specialpage/AuthManagerSpecialPage.php | 2 +- .../specialpage/ChangesListSpecialPage.php | 2 +- includes/specialpage/FormSpecialPage.php | 2 +- .../specialpage/LoginSignupSpecialPage.php | 4 +-- includes/specialpage/SpecialPage.php | 4 +-- includes/specialpage/SpecialPageFactory.php | 4 +-- ...ialContributions__formatRow__flagsHook.php | 2 +- .../Hook/SpecialCreateAccountBenefitsHook.php | 2 +- .../Hook/SpecialStatsAddExtraHook.php | 2 +- includes/specials/SpecialBlock.php | 2 +- includes/specials/SpecialEmailUser.php | 2 +- includes/specials/SpecialNewFiles.php | 4 +-- includes/specials/SpecialPageLanguage.php | 2 +- includes/specials/SpecialPreferences.php | 2 +- includes/specials/SpecialRecentChanges.php | 2 +- includes/specials/SpecialUndelete.php | 2 +- includes/specials/SpecialWatchlist.php | 2 +- includes/specials/forms/UploadForm.php | 1 + includes/specials/helpers/ImportReporter.php | 2 ++ includes/specials/helpers/LoginHelper.php | 2 ++ includes/specials/pagers/ActiveUsersPager.php | 2 +- .../specials/pagers/AllMessagesTablePager.php | 2 +- includes/specials/pagers/BlockListPager.php | 2 +- includes/specials/pagers/CategoryPager.php | 2 +- includes/specials/pagers/ContribsPager.php | 2 +- .../specials/pagers/DeletedContribsPager.php | 2 +- includes/specials/pagers/ImageListPager.php | 2 +- .../specials/pagers/MergeHistoryPager.php | 2 +- includes/specials/pagers/NewFilesPager.php | 2 +- includes/specials/pagers/NewPagesPager.php | 2 +- includes/specials/pagers/PagerTools.php | 2 +- .../specials/pagers/ProtectedPagesPager.php | 2 +- .../specials/pagers/ProtectedTitlesPager.php | 2 +- includes/specials/pagers/UsersPager.php | 2 +- includes/title/Title.php | 2 +- includes/upload/UploadBase.php | 1 + includes/upload/UploadFromUrl.php | 1 + includes/upload/UploadStash.php | 1 + includes/user/Options/UserOptionsManager.php | 2 +- includes/user/User.php | 2 +- includes/user/UserGroupMembership.php | 4 +-- includes/utils/MWTimestamp.php | 2 +- index.php | 1 + load.php | 1 + maintenance/rebuildFileCache.php | 1 + maintenance/update.php | 1 + mw-config/index.php | 1 + tests/parser/ParserTestRunner.php | 2 ++ .../phpunit/MediaWikiIntegrationTestCase.php | 1 + .../includes/Output/OutputPageTest.php | 1 + .../DefaultOutputPipelineFactoryTest.php | 2 +- .../OutputTransformStageTestBase.php | 2 +- .../ExecutePostCacheTransformHooksTest.php | 2 +- .../Permissions/PermissionManagerTest.php | 2 +- .../Request/ContentSecurityPolicyTest.php | 1 + .../phpunit/includes/Rest/EntryPointTest.php | 2 +- .../includes/actions/ActionEntryPointTest.php | 2 +- .../actions/ActionFactoryIntegrationTest.php | 1 + tests/phpunit/includes/actions/ActionTest.php | 3 +++ .../includes/actions/RollbackActionTest.php | 4 +-- .../includes/actions/WatchActionTest.php | 3 +++ tests/phpunit/includes/api/ApiBaseTest.php | 2 ++ .../includes/api/ApiComparePagesTest.php | 1 + .../api/ApiContinuationManagerTest.php | 2 ++ .../phpunit/includes/api/ApiEditPageTest.php | 1 + tests/phpunit/includes/api/ApiMainTest.php | 1 + .../includes/api/ApiOpenSearchTest.php | 1 + tests/phpunit/includes/api/ApiOptionsTest.php | 3 +++ tests/phpunit/includes/api/ApiPageSetTest.php | 1 + tests/phpunit/includes/api/ApiPurgeTest.php | 1 + tests/phpunit/includes/api/ApiTestCase.php | 1 + tests/phpunit/includes/api/ApiTestContext.php | 2 ++ .../includes/api/format/ApiFormatBaseTest.php | 1 + .../includes/api/format/ApiFormatTestBase.php | 1 + .../includes/api/query/ApiQueryInfoTest.php | 1 + .../phpunit/includes/auth/AuthManagerTest.php | 3 ++- ...cksSecondaryAuthenticationProviderTest.php | 2 +- .../block/BlockErrorFormatterTest.php | 3 +++ .../changes/EnhancedChangesListTest.php | 1 + .../includes/changes/OldChangesListTest.php | 1 + .../changes/TestRecentChangesHelper.php | 1 + .../includes/content/ContentHandlerTest.php | 1 + .../content/ContentModelChangeTest.php | 1 + .../content/FallbackContentHandlerTest.php | 1 + .../includes/content/TextContentTest.php | 1 + tests/phpunit/includes/debug/MWDebugTest.php | 1 + .../includes/diff/DifferenceEngineTest.php | 2 ++ .../TextDiffer/ManifoldTextDifferTest.php | 1 + .../diff/TextDiffer/PhpTextDifferTest.php | 1 + .../TextDiffer/Wikidiff2TextDifferTest.php | 1 + .../diff/TextSlotDiffRendererTest.php | 1 + .../editpage/EditPageConstraintsTest.php | 1 + .../includes/editpage/EditPageTest.php | 1 + .../exception/UserBlockedErrorTest.php | 1 + .../includes/htmlform/HTMLFormFieldTest.php | 2 ++ .../includes/htmlform/HTMLFormTest.php | 1 + .../import/ImportLinkCacheIntegrationTest.php | 1 + .../language/LanguageConverterTest.php | 1 + .../linkeddata/PageDataRequestHandlerTest.php | 2 ++ tests/phpunit/includes/linker/LinkerTest.php | 1 + .../includes/logging/LogFormatterTest.php | 2 ++ .../includes/logging/LogFormatterTestCase.php | 1 + .../logging/ProtectLogFormatterTest.php | 1 + tests/phpunit/includes/page/ArticleTest.php | 1 + .../phpunit/includes/page/ArticleViewTest.php | 2 ++ .../includes/pager/HistoryPagerTest.php | 1 + .../includes/parser/ExtraParserTest.php | 1 + .../includes/parser/ParserOptionsTest.php | 2 ++ .../includes/parser/ParserOutputTest.php | 1 + .../DefaultPreferencesFactoryTest.php | 2 ++ .../includes/session/SessionBackendTest.php | 7 ++--- .../includes/session/SessionManagerTest.php | 3 ++- .../includes/skins/SkinMustacheTest.php | 1 + tests/phpunit/includes/skins/SkinTest.php | 1 + ...AbstractChangesListSpecialPageTestCase.php | 2 ++ .../ChangesListSpecialPageTest.php | 1 + .../specialpage/SpecialPageFactoryTest.php | 1 + .../includes/specials/ContribsPagerTest.php | 1 + .../Contribute/ContributeFactoryTest.php | 1 + .../specials/DeletedContribsPagerTest.php | 1 + .../includes/specials/ImageListPagerTest.php | 1 + .../includes/specials/SpecialBlockTest.php | 2 ++ .../specials/SpecialGoToInterwikiTest.php | 2 ++ .../includes/specials/SpecialLogTest.php | 1 + .../specials/SpecialMIMESearchTest.php | 1 + .../specials/SpecialMyLanguageTest.php | 1 + .../includes/specials/SpecialPageExecutor.php | 2 ++ .../specials/SpecialRecentChangesTest.php | 1 + .../includes/specials/SpecialSearchTest.php | 1 + .../SpecialUncategorizedCategoriesTest.php | 1 + .../specials/SpecialUserLogoutTest.php | 1 + .../specials/pagers/BlockListPagerTest.php | 1 + .../includes/user/UserGroupManagerTest.php | 2 +- tests/phpunit/includes/user/UserTest.php | 1 + .../Rest/Handler/MediaFileHandlerTest.php | 2 +- .../Rest/Handler/MediaLinksHandlerTest.php | 2 +- .../Rest/Handler/RootSpecHandlerTest.php | 2 +- .../includes/Storage/UndoIntegrationTest.php | 2 +- .../context/DerivativeContextTest.php | 6 ++--- .../includes/context/RequestContextTest.php | 4 +-- ...tFilterMergedContentHookConstraintTest.php | 1 + .../maintenance/PageDumpTestDataTrait.php | 2 +- tests/phpunit/mocks/MockEnvironment.php | 2 +- .../mocks/permissions/MockAuthorityTrait.php | 2 +- tests/phpunit/structure/ApiStructureTest.php | 1 + tests/phpunit/structure/RestStructureTest.php | 2 ++ .../ActionModuleBasedHandlerTestTrait.php | 2 +- .../unit/includes/actions/ViewActionTest.php | 2 ++ .../includes/api/ApiModuleManagerTest.php | 1 + thumb.php | 1 + 299 files changed, 450 insertions(+), 153 deletions(-) diff --git a/RELEASE-NOTES-1.42 b/RELEASE-NOTES-1.42 index f859a55faac..d63cc20f2bc 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 diff --git a/api.php b/api.php index 5d4946c31b6..49600b6a2c4 100644 --- a/api.php +++ b/api.php @@ -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 0d57e0c6dba..cde0f3bdbe4 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 e0d25c0806e..edc27c7ce1e 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 32d06cdf65a..abcdec63570 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 574331152e5..cc677f66917 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 a3ad70c6302..c8336cc532d 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 c86e9b52484..85bd33bab66 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 4fe5d48fa53..0cea396a9ea 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 5259f0b843d..88ee4fe42e3 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 fd00d2a5678..1080f56041f 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 e001bf8be08..eb69946c55c 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 e82191fcaaf..33243e1ae94 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 e0d5e843fbd..b3f9867e9cb 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 8840517f626..4eecd2fa210 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 91770635b23..f28a6be8768 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 216811e1ea0..935c2096df6 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 7519e49110e..aecae45e26e 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 1829f59793d..205a40c88d6 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 04def31c74e..570aa9011f3 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 899ede950bc..0a068dddf1f 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 ffebb8c94a0..3f4bb5aa2b3 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 f7b426db3d0..0e2652e5d87 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 250a500fcf6..913ad341814 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 074e8a0ba2e..5a26b6f008e 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 611ddcc5369..8fb018d84c5 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 df3423a56b8..b822f5d95b3 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 211879248a6..3729dbfb85f 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 6cff3bff3ba..91a3382c4f2 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 4e6d525d4e5..0e07c6464c6 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 ec88d133a61..058d5d2b0df 100644 --- a/includes/actions/CreditsAction.php +++ b/includes/actions/CreditsAction.php @@ -23,6 +23,7 @@ * @author */ +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 1c1b615cd3c..408cb2c4085 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 d801b9c7809..eb302fbb7f2 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 2fd3c6f0182..e3c93b9d222 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 dcd4bc90f1d..3622c795425 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 47d92ce28e7..0b669f77054 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 8e5832d0c77..bd287aab7bc 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 7f96dd7bef4..615bfcca2bd 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 097adfe80fa..b444f9fe1dc 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 480ae5aa826..e79fd7243b7 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 c4ff4fdd0f0..fa8dfe9361a 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 94806f2c0f2..a327c745ae6 100644 --- a/includes/actions/RevertAction.php +++ b/includes/actions/RevertAction.php @@ -23,6 +23,7 @@ * @author Rob Church */ +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 a3c1a3513db..3de00ebb508 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 d04f8e287f6..7cadf4b04b2 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 0858761927c..2395add8987 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 be747d195d8..3977e651c67 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 6141de65749..aa801f0558b 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 046b113d705..6de25939914 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 e2bbcc2bca3..289ddc1ff8f 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 b9e46471528..dfa2254ab29 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 5c6b327dc99..dff15298add 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 9d6587128f5..3f9f60c66e8 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 b398c0b89c6..862068fac08 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 5f18bcfde0e..a14e232c298 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 aae48fdc944..e8190c7e941 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 88a76406594..3c89cf0181d 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 0bfd58b1b33..52f82988868 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 43b42dd074d..b098cba1712 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 c1c61843513..afa5cf498c0 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 8155ea40458..e2d17ab50b0 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 f9aecf0ef82..4792f029d62 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 6d0d59adacc..44e70bc4c7f 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 b0d481e68fa..88c1e80d1aa 100644 --- a/includes/changes/EnhancedChangesList.php +++ b/includes/changes/EnhancedChangesList.php @@ -1,5 +1,6 @@ getContext()->getCsrfTokenSet(); } } + +/** @deprecated since 1.42 */ +class_alias( ContextSource::class, 'ContextSource' ); diff --git a/includes/context/DerivativeContext.php b/includes/context/DerivativeContext.php index ce883195672..573425d7364 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 b2cea368ede..defd174fd83 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 070192c11de..f1dd18e994a 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 298b03a8235..12328ddab2d 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 e95f1129852..4010a90201a 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 0645478a605..96b5d530922 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 3028a40f530..1c34c74f77b 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 cd50cf07132..593e5bfc5e1 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 0016a49a488..07b2988785b 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 d4d40042eee..9da566cf0ef 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 bb44281bbda..aced2dbdc38 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 023155eed5f..2524c74b4fc 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 d6a06b6b78e..38718443b63 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 cdfa78046e7..40add1fcb05 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 5d2c8668161..5c77e1969b5 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 d438cde5b01..0857259bd00 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 6d08e29a7e2..b4ccb5bf31e 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 50b401c1abf..8d7d0ae9754 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 8dfdeb79177..77ea900af1a 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 e8047fcc144..5ba58fff7ee 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 92365d4c893..3bf766c9c70 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 3564ee704b3..4b8a8e97d05 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 1d4cf53720b..12aadefbd04 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 25b6122489b..4fa04059488 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 07d67e6db5a..3532ae48e02 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 77800a70d95..57381c97f82 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 6bbea8762d9..8453f77a314 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 1c8145958e1..aaf213ccdf1 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 1556df1044b..adbd7dd220b 100644 --- a/includes/htmlform/HTMLFormField.php +++ b/includes/htmlform/HTMLFormField.php @@ -1,5 +1,6 @@ */ +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 83543274d32..df6ab579cfc 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 aae4ee0f55e..9f2ec6c4588 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 217e2e4771c..b846a6098ad 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 28325bc040c..8f6527b5f7c 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 8254562481e..5b240018cfd 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 85754c776e0..a65c07c31c0 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 705c3f07a5a..c0f986cec6f 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 9c587a8896d..6044b4a4947 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 2608e2b5f43..e54ddc47268 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 9bd15d9d550..6015b1fc3f8 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 9b3b0621bc0..97c31c2ec5a 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 24c7bc4208d..db3bdf16400 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 386eb20a1d2..1b96e176365 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 0dd65613757..7018b07429e 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 0aa51212b19..6e345fbb08c 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 9e439c1872b..bd6cacd2a36 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 e39d8f4f848..cef5d7f52dd 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 fc16a416889..936a63549a0 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 4952a38bd77..5b824e45632 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 56259de17c0..d352b1a21df 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 7c7bf6c2890..45fae53ef2e 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 ee8d0826adc..75ea2070e88 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 250d8aca334..1f350352a08 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 430680a544c..ca9cf8adbe5 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 3f023b7a54f..d80a03650d3 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 91b22630869..6ba791403bc 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 8bf5d5d95f3..64d7704914b 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 e2fa646139e..4e4b3cd786f 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 b9aacd58b35..b97b8b77805 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 d7412f3712b..58d3fb2bfb0 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 37791d6dd61..2ceec8164dd 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 e6eb0dd66be..5ece8ae0029 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 c347363d864..59b6d2787e6 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 57f1416c338..e6f494ac9a3 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 3585b821340..12037d6b699 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 6eb1d4186e6..4dd42b17f91 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 33b75ba7f81..a978257561a 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 c9e330f1495..bef08fbc61e 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 cf068da08fc..d4c4813a3dc 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 e4efe94366d..4ac9b6873cc 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 59661892c30..f19ab185b41 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 77f346d2992..bc33ef7c383 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 68bfba6aaab..70263e2e1d2 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 74cd8bdb05f..b0057e4b265 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 228eaa93db1..f81d4b4da0f 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 e9041ab820f..8c0e6a2db6a 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 59d6795ca81..5a289d8eab7 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 14b87bc1c1d..8b0d9c3473b 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 4b11ccf2701..9c7b3f5f2d0 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 a5ee53f12b1..5888181620d 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 3ef25005faf..9e3e9e464e9 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 a567be305b2..73bd4492b4a 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 9cd1c7b177e..4b2215e5a4e 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 81ccf038db9..77328e3daec 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 37e19e33368..e4268b4cce8 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 0c0beec47c4..554b3aa6c43 100644 --- a/includes/specials/helpers/LoginHelper.php +++ b/includes/specials/helpers/LoginHelper.php @@ -1,5 +1,7 @@ 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 13aa1f587f9..7bf815cc722 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 72493d8db24..cbd0ac05797 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 067879fea08..a7b53f28372 100644 --- a/tests/phpunit/includes/changes/EnhancedChangesListTest.php +++ b/tests/phpunit/includes/changes/EnhancedChangesListTest.php @@ -1,5 +1,6 @@ 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 ea8d1375248..6937c1330b6 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 eb69ecd8b5b..af2af329513 100644 --- a/tests/phpunit/includes/skins/SkinMustacheTest.php +++ b/tests/phpunit/includes/skins/SkinMustacheTest.php @@ -1,5 +1,6 @@