X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderClientHtml.php;h=6529a9a306b1bcdfbaad08b75fe2c2a2d76f9dbd;hp=8303896ef791c023d95077e0ba7ac90538d503f0;hb=5155abe0e6ab6589d4104a221df0a0b2c5142c16;hpb=d4e0dbcf96d2a9cdff4a73f56d33beb5c25aa442

diff --git a/includes/resourceloader/ResourceLoaderClientHtml.php b/includes/resourceloader/ResourceLoaderClientHtml.php
index 8303896ef7..6529a9a306 100644
--- a/includes/resourceloader/ResourceLoaderClientHtml.php
+++ b/includes/resourceloader/ResourceLoaderClientHtml.php
@@ -24,6 +24,7 @@ use Wikimedia\WrappedStringList;
 /**
  * Load and configure a ResourceLoader client on an HTML page.
  *
+ * @ingroup ResourceLoader
  * @since 1.28
  */
 class ResourceLoaderClientHtml {
@@ -212,7 +213,7 @@ class ResourceLoaderClientHtml {
 				// Load from load.php?only=styles via <link rel=stylesheet>
 				$data['styles'][] = $name;
 			}
-			$deprecation = $module->getDeprecationInformation();
+			$deprecation = $module->getDeprecationInformation( $context );
 			if ( $deprecation ) {
 				$data['styleDeprecations'][] = $deprecation;
 			}
@@ -253,14 +254,14 @@ class ResourceLoaderClientHtml {
 		// See also startup/startup.js.
 		$nojsClass = $nojsClass ?? $this->getDocumentAttributes()['class'];
 		$jsClass = preg_replace( '/(^|\s)client-nojs(\s|$)/', '$1client-js$2', $nojsClass );
-		$jsClassJson = ResourceLoader::encodeJsonForScript( $jsClass );
+		$jsClassJson = $this->context->encodeJson( $jsClass );
 		$script = <<<JAVASCRIPT
 document.documentElement.className = {$jsClassJson};
 JAVASCRIPT;
 
 		// Inline script: Declare mw.config variables for this page.
 		if ( $this->config ) {
-			$confJson = ResourceLoader::encodeJsonForScript( $this->config );
+			$confJson = $this->context->encodeJson( $this->config );
 			$script .= <<<JAVASCRIPT
 RLCONF = {$confJson};
 JAVASCRIPT;
@@ -269,7 +270,7 @@ JAVASCRIPT;
 		// Inline script: Declare initial module states for this page.
 		$states = array_merge( $this->exemptStates, $data['states'] );
 		if ( $states ) {
-			$stateJson = ResourceLoader::encodeJsonForScript( $states );
+			$stateJson = $this->context->encodeJson( $states );
 			$script .= <<<JAVASCRIPT
 RLSTATE = {$stateJson};
 JAVASCRIPT;
@@ -277,7 +278,7 @@ JAVASCRIPT;
 
 		// Inline script: Declare general modules to load on this page.
 		if ( $data['general'] ) {
-			$pageModulesJson = ResourceLoader::encodeJsonForScript( $data['general'] );
+			$pageModulesJson = $this->context->encodeJson( $data['general'] );
 			$script .= <<<JAVASCRIPT
 RLPAGEMODULES = {$pageModulesJson};
 JAVASCRIPT;
@@ -427,7 +428,6 @@ JAVASCRIPT;
 				$idx = -1;
 				foreach ( $grpModules as $name => $module ) {
 					$shouldEmbed = $module->shouldEmbedModule( $context );
-					// @phan-suppress-next-line PhanTypeInvalidDimOffset
 					if ( !$moduleSets || $moduleSets[$idx][0] !== $shouldEmbed ) {
 						$moduleSets[++$idx] = [ $shouldEmbed, [] ];
 					}
@@ -479,7 +479,7 @@ JAVASCRIPT;
 							] );
 						} else {
 							$chunk = ResourceLoader::makeInlineScript(
-								Xml::encodeJsCall( 'mw.loader.load', [ $url ] ),
+								'mw.loader.load(' . $mainContext->encodeJson( $url ) . ');',
 								$nonce
 							);
 						}