X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderModule.php;h=3dd7a4b0e2998d96c4e6ed804a58ee6794d1e0e2;hb=9435cd81b07f94a8283d23aff8835c9c734f05db;hp=5b030d7661811fb0c7f44ee2652f00ffc6a1b343;hpb=10783e29e4f2adc6fef6d3584c6306dc98029996;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php
index 5b030d7661..3dd7a4b0e2 100644
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -67,10 +67,6 @@ abstract class ResourceLoaderModule {
 	// In-object cache for module content
 	protected $contents = array();
 
-	// Whether the position returned by getPosition() is defined in the module configuration
-	// and not a default value
-	protected $isPositionDefined = false;
-
 	/**
 	 * @var Config
 	 */
@@ -291,19 +287,6 @@ abstract class ResourceLoaderModule {
 		return 'bottom';
 	}
 
-	/**
-	 * Whether the position returned by getPosition() is a default value or comes from the module
-	 * definition. This method is meant to be short-lived, and is only useful until classes added
-	 * via addModuleStyles with a default value define an explicit position. See getModuleStyles()
-	 * in OutputPage for the related migration warning.
-	 *
-	 * @return bool
-	 * @since  1.26
-	 */
-	public function isPositionDefault() {
-		return !$this->isPositionDefined;
-	}
-
 	/**
 	 * Whether this module's JS expects to work without the client-side ResourceLoader module.
 	 * Returning true from this function will prevent mw.loader.state() call from being
@@ -423,7 +406,7 @@ abstract class ResourceLoaderModule {
 	/**
 	 * Set the files this module depends on indirectly for a given skin.
 	 *
-	 * @since 1.26
+	 * @since 1.27
 	 * @param ResourceLoaderContext $context
 	 * @param array $localFileRefs List of files
 	 */
@@ -457,11 +440,11 @@ abstract class ResourceLoaderModule {
 	 * This is used to make file paths safe for storing in a database without the paths
 	 * becoming stale or incorrect when MediaWiki is moved or upgraded (T111481).
 	 *
-	 * @since 1.26
+	 * @since 1.27
 	 * @param array $filePaths
 	 * @return array
 	 */
-	protected static function getRelativePaths( Array $filePaths ) {
+	public static function getRelativePaths( Array $filePaths ) {
 		global $IP;
 		return array_map( function ( $path ) use ( $IP ) {
 			return RelPath\getRelativePath( $path, $IP );
@@ -471,11 +454,11 @@ abstract class ResourceLoaderModule {
 	/**
 	 * Expand directories relative to $IP.
 	 *
-	 * @since 1.26
+	 * @since 1.27
 	 * @param array $filePaths
 	 * @return array
 	 */
-	protected static function expandRelativePaths( Array $filePaths ) {
+	public static function expandRelativePaths( Array $filePaths ) {
 		global $IP;
 		return array_map( function ( $path ) use ( $IP ) {
 			return RelPath\joinPath( $IP, $path );
@@ -527,7 +510,7 @@ abstract class ResourceLoaderModule {
 	/**
 	 * Get module-specific LESS variables, if any.
 	 *
-	 * @since 1.26
+	 * @since 1.27
 	 * @param ResourceLoaderContext $context
 	 * @return array Module-specific LESS variables.
 	 */
@@ -619,11 +602,11 @@ abstract class ResourceLoaderModule {
 								foreach ( $style as $cssText ) {
 									if ( is_string( $cssText ) ) {
 										$stylePairs[$media][] =
-											$rl->filter( 'minify-css', $cssText );
+											ResourceLoader::filter( 'minify-css', $cssText );
 									}
 								}
 							} elseif ( is_string( $style ) ) {
-								$stylePairs[$media] = $rl->filter( 'minify-css', $style );
+								$stylePairs[$media] = ResourceLoader::filter( 'minify-css', $style );
 							}
 						}
 					}
@@ -874,14 +857,13 @@ abstract class ResourceLoaderModule {
 	protected function validateScriptFile( $fileName, $contents ) {
 		if ( $this->getConfig()->get( 'ResourceLoaderValidateJS' ) ) {
 			// Try for cache hit
-			// Use CACHE_ANYTHING since parsing JS is much slower than a DB query
-			$key = wfMemcKey(
+			$cache = ObjectCache::getLocalClusterInstance();
+			$key = $cache->makeKey(
 				'resourceloader',
 				'jsparse',
 				self::$parseCacheVersion,
 				md5( $contents )
 			);
-			$cache = wfGetCache( CACHE_ANYTHING );
 			$cacheEntry = $cache->get( $key );
 			if ( is_string( $cacheEntry ) ) {
 				return $cacheEntry;