From cd22ba020ee5f6c43028ec815257fdb26f088d66 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Wed, 20 Aug 2014 18:48:10 +0200 Subject: [PATCH] Consistently use 'Less' rather than 'LESS' in function names PHP function names are case-insensitive, so this is a fully backwards-compatible change. Change-Id: Ide04ad542ac5c3a26b6064093ae272cf9aeef2d1 --- includes/resourceloader/ResourceLoader.php | 4 ++-- includes/resourceloader/ResourceLoaderFileModule.php | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php index 198420ca87..c2004080a5 100644 --- a/includes/resourceloader/ResourceLoader.php +++ b/includes/resourceloader/ResourceLoader.php @@ -1481,7 +1481,7 @@ class ResourceLoader { $less = new lessc(); $less->setPreserveComments( true ); - $less->setVariables( self::getLESSVars( $config ) ); + $less->setVariables( self::getLessVars( $config ) ); $less->setImportDir( $config->get( 'ResourceLoaderLESSImportPaths' ) ); foreach ( $config->get( 'ResourceLoaderLESSFunctions' ) as $name => $func ) { $less->registerFunction( $name, $func ); @@ -1496,7 +1496,7 @@ class ResourceLoader { * @since 1.22 * @return array Map of variable names to string CSS values. */ - public static function getLESSVars( Config $config ) { + public static function getLessVars( Config $config ) { $lessVars = $config->get( 'ResourceLoaderLESSVars' ); // Sort by key to ensure consistent hashing for cache lookups. ksort( $lessVars ); diff --git a/includes/resourceloader/ResourceLoaderFileModule.php b/includes/resourceloader/ResourceLoaderFileModule.php index 8a223b05f5..9fdeb91ba0 100644 --- a/includes/resourceloader/ResourceLoaderFileModule.php +++ b/includes/resourceloader/ResourceLoaderFileModule.php @@ -859,7 +859,7 @@ class ResourceLoaderFileModule extends ResourceLoaderModule { } if ( $this->getStyleSheetLang( $localPath ) === 'less' ) { - $style = $this->compileLESSFile( $localPath ); + $style = $this->compileLessFile( $localPath ); $this->hasGeneratedStyles = true; } else { $style = file_get_contents( $localPath ); @@ -908,8 +908,8 @@ class ResourceLoaderFileModule extends ResourceLoaderModule { * @param string $fileName File name of root LESS file. * @return string Cache key */ - protected function getLESSCacheKey( $fileName ) { - $vars = json_encode( ResourceLoader::getLESSVars( $this->getConfig() ) ); + protected function getLessCacheKey( $fileName ) { + $vars = json_encode( ResourceLoader::getLessVars( $this->getConfig() ) ); $hash = md5( $fileName . $vars ); return wfMemcKey( 'resourceloader', 'less', $hash ); } @@ -929,8 +929,8 @@ class ResourceLoaderFileModule extends ResourceLoaderModule { * @param string $fileName File path of LESS source * @return string CSS source */ - protected function compileLESSFile( $fileName ) { - $key = $this->getLESSCacheKey( $fileName ); + protected function compileLessFile( $fileName ) { + $key = $this->getLessCacheKey( $fileName ); $cache = wfGetCache( CACHE_ANYTHING ); // The input to lessc. Either an associative array representing the -- 2.20.1