diff options
| author | Amir Sarabadani <ladsgroup@gmail.com> | 2023-09-07 13:46:15 +0200 |
|---|---|---|
| committer | James D. Forrester <jforrester@wikimedia.org> | 2023-09-11 21:44:34 +0100 |
| commit | 5bd33d46efe9e7fd49194dcf4263ab1f23bf130c (patch) | |
| tree | 277d3f280663702b6a32e2d4e7e2ed00183fd926 /includes/ResourceLoader/ResourceLoader.php | |
| parent | 2f2802eb75266605df7b2e664be3c4efea9363f9 (diff) | |
| download | mediawikicore-5bd33d46efe9e7fd49194dcf4263ab1f23bf130c.tar.gz mediawikicore-5bd33d46efe9e7fd49194dcf4263ab1f23bf130c.zip | |
Reorg: Move WebRequest to includes\Request
This has been approved as part of RFC T166010
Bug: T321882
Change-Id: I6bbdbbe6ea48cc1f50bc568bb8780fc7c5361a6f
Diffstat (limited to 'includes/ResourceLoader/ResourceLoader.php')
| -rw-r--r-- | includes/ResourceLoader/ResourceLoader.php | 5 |
1 files changed, 3 insertions, 2 deletions
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', |