Namespace includes/context

Bug: T353458
Change-Id: I4dbef138fd0110c14c70214282519189d70c94fb

10 files changed, 14 insertions, 3 deletions

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index be747d195d86..3977e651c67b 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -23,6 +23,8 @@
 use MediaWiki\Api\ApiHookRunner;
 use MediaWiki\Api\Validator\SubmoduleDef;
 use MediaWiki\Block\Block;
+use MediaWiki\Context\ContextSource;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Language\RawMessage;
 use MediaWiki\MainConfigNames;
diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index 6141de657498..aa801f0558b4 100644
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -21,6 +21,7 @@
  */
 
 use MediaWiki\Content\IContentHandlerFactory;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\EditPage\EditPage;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
diff --git a/includes/api/ApiEntryPoint.php b/includes/api/ApiEntryPoint.php
index 046b113d705a..6de25939914f 100644
--- a/includes/api/ApiEntryPoint.php
+++ b/includes/api/ApiEntryPoint.php
@@ -29,6 +29,7 @@ namespace MediaWiki\Api;
 
 use ApiMain;
 use LogicException;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\EntryPointEnvironment;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Logger\LegacyLogger;
@@ -36,7 +37,6 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiEntryPoint;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Title\Title;
-use RequestContext;
 use Throwable;
 
 /**
diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php
index e2bbcc2bca3f..289ddc1ff8fc 100644
--- a/includes/api/ApiHelp.php
+++ b/includes/api/ApiHelp.php
@@ -20,6 +20,8 @@
  * @file
  */
 
+use MediaWiki\Context\DerivativeContext;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Html\Html;
 use MediaWiki\Html\HtmlHelper;
 use MediaWiki\Linker\Linker;
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index b9e46471528a..dfa2254ab29b 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -22,6 +22,9 @@
  */
 
 use MediaWiki\Api\Validator\ApiParamValidator;
+use MediaWiki\Context\DerivativeContext;
+use MediaWiki\Context\IContextSource;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Html\Html;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
diff --git a/includes/api/ApiModuleManager.php b/includes/api/ApiModuleManager.php
index 5c6b327dc997..dff15298add7 100644
--- a/includes/api/ApiModuleManager.php
+++ b/includes/api/ApiModuleManager.php
@@ -21,6 +21,7 @@
  * @since 1.21
  */
 
+use MediaWiki\Context\ContextSource;
 use MediaWiki\MediaWikiServices;
 use Wikimedia\ObjectFactory\ObjectFactory;
 
diff --git a/includes/api/ApiParamInfo.php b/includes/api/ApiParamInfo.php
index 9d6587128f57..3f9f60c66e89 100644
--- a/includes/api/ApiParamInfo.php
+++ b/includes/api/ApiParamInfo.php
@@ -20,6 +20,7 @@
  * @file
  */
 
+use MediaWiki\Context\RequestContext;
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\User\UserFactory;
 use MediaWiki\Utils\ExtensionInfo;
diff --git a/includes/api/Hook/ApiFeedContributions__feedItemHook.php b/includes/api/Hook/ApiFeedContributions__feedItemHook.php
index b398c0b89c65..862068fac082 100644
--- a/includes/api/Hook/ApiFeedContributions__feedItemHook.php
+++ b/includes/api/Hook/ApiFeedContributions__feedItemHook.php
@@ -3,7 +3,7 @@
 namespace MediaWiki\Api\Hook;
 
 // phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps
-use IContextSource;
+use MediaWiki\Context\IContextSource;
 use stdClass;
 
 /**
diff --git a/includes/api/Hook/ApiFormatHighlightHook.php b/includes/api/Hook/ApiFormatHighlightHook.php
index 5f18bcfde0ed..a14e232c2982 100644
--- a/includes/api/Hook/ApiFormatHighlightHook.php
+++ b/includes/api/Hook/ApiFormatHighlightHook.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Api\Hook;
 
-use IContextSource;
+use MediaWiki\Context\IContextSource;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.
diff --git a/includes/api/SearchApi.php b/includes/api/SearchApi.php
index aae48fdc9449..e8190c7e941c 100644
--- a/includes/api/SearchApi.php
+++ b/includes/api/SearchApi.php
@@ -20,6 +20,7 @@
  * @since 1.28
  */
 
+use MediaWiki\Context\IContextSource;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\ParamValidator\TypeDef\IntegerDef;