Reorg: Move WebRequest to includes\Request

This has been approved as part of RFC T166010

Bug: T321882
Change-Id: I6bbdbbe6ea48cc1f50bc568bb8780fc7c5361a6f

3 files changed, 5 insertions, 4 deletions

diff --git a/includes/ResourceLoader/Context.php b/includes/ResourceLoader/Context.php
index b602ae0c582b..d28c0811c381 100644
--- a/includes/ResourceLoader/Context.php
+++ b/includes/ResourceLoader/Context.php
@@ -26,6 +26,7 @@ use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageReferenceValue;
 use MediaWiki\Request\FauxRequest;
+use MediaWiki\Request\WebRequest;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserRigorOptions;
 use Message;
@@ -33,7 +34,6 @@ use MessageLocalizer;
 use MessageSpecifier;
 use Psr\Log\LoggerInterface;
 use User;
-use WebRequest;
 
 /**
  * Context object that contains information about the state of a specific
diff --git a/includes/ResourceLoader/DerivativeContext.php b/includes/ResourceLoader/DerivativeContext.php
index 0744e4238a41..756dc37271cd 100644
--- a/includes/ResourceLoader/DerivativeContext.php
+++ b/includes/ResourceLoader/DerivativeContext.php
@@ -22,10 +22,10 @@
 namespace MediaWiki\ResourceLoader;
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Request\WebRequest;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserRigorOptions;
 use User;
-use WebRequest;
 
 /**
  * A mutable version of Context.
diff --git a/includes/ResourceLoader/ResourceLoader.php b/includes/ResourceLoader/ResourceLoader.php
index 344a1e3459f9..33ce2660da67 100644
--- a/includes/ResourceLoader/ResourceLoader.php
+++ b/includes/ResourceLoader/ResourceLoader.php
@@ -42,6 +42,7 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Output\OutputPage;
 use MediaWiki\Profiler\ProfilingContext;
 use MediaWiki\Request\HeaderCallback;
+use MediaWiki\Request\WebRequest;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserOptionsLookup;
 use MediaWiki\WikiMap\WikiMap;
@@ -56,7 +57,6 @@ use RuntimeException;
 use stdClass;
 use Throwable;
 use UnexpectedValueException;
-use WebRequest;
 use Wikimedia\DependencyStore\DependencyStore;
 use Wikimedia\DependencyStore\KeyValueDependencyStore;
 use Wikimedia\Minify\CSSMin;
@@ -864,7 +864,6 @@ class ResourceLoader implements LoggerAwareInterface {
 			}
 		}
 
-		// @phan-suppress-next-line SecurityCheck-XSS
 		echo $response;
 	}
 
@@ -1892,6 +1891,8 @@ MESSAGE;
 	public static function inDebugMode() {
 		if ( self::$debugMode === null ) {
 			global $wgRequest;
+			'@phan-var \MediaWiki\Request\WebRequest $wgRequest';
+
 			$resourceLoaderDebug = MediaWikiServices::getInstance()->getMainConfig()->get(
 				MainConfigNames::ResourceLoaderDebug );
 			$str = $wgRequest->getRawVal( 'debug',