Merge "includes/resourceloader/: Use Config instead of globals"

diff --combined docs/hooks.txt
index becaf40,7510129..4a469b6
--- 1/docs/hooks.txt
--- 2/docs/hooks.txt
+++ b/docs/hooks.txt
@@@ -2148,7 -2148,7 +2148,7 @@@ $oldSessionID: old session i
  $newSessionID: new session id
  
  'ResourceLoaderGetConfigVars': Called at the end of
- ResourceLoaderStartUpModule::getConfig(). Use this to export static
+ ResourceLoaderStartUpModule::getConfigSettings(). Use this to export static
  configuration variables to JavaScript. Things that depend on the current page
  or request state must be added through MakeGlobalVariablesScript instead.
  &$vars: array( variable name => value )
@@@ -2734,11 -2734,11 +2734,11 @@@ string &$error: output: message key fo
    returning false. May also be an array, where the first element is the message
    key and the remaining elements are used as parameters to the message.
  
 -'UploadVerifyFile': extra file verification, based on mime type, etc. Preferred
 +'UploadVerifyFile': extra file verification, based on MIME type, etc. Preferred
  in most cases over UploadVerification.
  object $upload: an instance of UploadBase, with all info about the upload
 -string $mime: The uploaded file's mime type, as detected by MediaWiki. Handlers
 -  will typically only apply for specific mime types.
 +string $mime: The uploaded file's MIME type, as detected by MediaWiki. Handlers
 +  will typically only apply for specific MIME types.
  object &$error: output: true if the file is valid. Otherwise, an indexed array
    representing the problem with the file, where the first element is the message
    key and the remaining elements are used as parameters to the message.

diff --combined includes/resourceloader/ResourceLoaderFileModule.php
index 03a9829,4b2094f..f646ae9
--- 1/includes/resourceloader/ResourceLoaderFileModule.php
--- 2/includes/resourceloader/ResourceLoaderFileModule.php
+++ b/includes/resourceloader/ResourceLoaderFileModule.php
@@@ -305,7 -305,9 +305,7 @@@ class ResourceLoaderFileModule extends 
                // but were preserved for backwards-compatibility just in case. Tread lightly.
  
                $localBasePath = $localBasePath === null ? $IP : $localBasePath;
 -              if ( $remoteBasePath !== null ) {
 -                      $remoteBasePath = $remoteBasePath;
 -              } else {
 +              if ( $remoteBasePath === null ) {
                        $remoteBasePath = $wgResourceBasePath === null ? $wgScriptPath : $wgResourceBasePath;
                }
  
@@@ -473,13 -475,12 +473,12 @@@
                        return null;
                }
  
-               global $wgResourceLoaderValidateStaticJS;
                $localPath = $this->getLocalPath( $this->skipFunction );
                if ( !file_exists( $localPath ) ) {
                        throw new MWException( __METHOD__ . ": skip function file not found: \"$localPath\"" );
                }
                $contents = file_get_contents( $localPath );
-               if ( $wgResourceLoaderValidateStaticJS ) {
+               if ( $this->getConfig()->get( 'ResourceLoaderValidateStaticJS' ) ) {
                        $contents = $this->validateScriptFile( $fileName, $contents );
                }
                return $contents;
@@@ -790,7 -791,6 +789,6 @@@
         * @return string Concatenated and remapped JavaScript data from $scripts
         */
        protected function readScriptFiles( array $scripts ) {
-               global $wgResourceLoaderValidateStaticJS;
                if ( empty( $scripts ) ) {
                        return '';
                }
@@@ -801,7 -801,7 +799,7 @@@
                                throw new MWException( __METHOD__ . ": script file not found: \"$localPath\"" );
                        }
                        $contents = file_get_contents( $localPath );
-                       if ( $wgResourceLoaderValidateStaticJS ) {
+                       if ( $this->getConfig()->get( 'ResourceLoaderValidateStaticJS' ) ) {
                                // Static files don't really need to be checked as often; unlike
                                // on-wiki module they shouldn't change unexpectedly without
                                // admin interference.
@@@ -909,8 -909,8 +907,8 @@@
         * @param string $fileName File name of root LESS file.
         * @return string Cache key
         */
-       protected static function getLESSCacheKey( $fileName ) {
-               $vars = json_encode( ResourceLoader::getLESSVars() );
+       protected function getLESSCacheKey( $fileName ) {
+               $vars = json_encode( ResourceLoader::getLESSVars( $this->getConfig() ) );
                $hash = md5( $fileName . $vars );
                return wfMemcKey( 'resourceloader', 'less', $hash );
        }
@@@ -931,7 -931,7 +929,7 @@@
         * @return string CSS source
         */
        protected function compileLESSFile( $fileName ) {
-               $key = self::getLESSCacheKey( $fileName );
+               $key = $this->getLESSCacheKey( $fileName );
                $cache = wfGetCache( CACHE_ANYTHING );
  
                // The input to lessc. Either an associative array representing the
@@@ -942,7 -942,7 +940,7 @@@
                        $source = $fileName;
                }
  
-               $compiler = ResourceLoader::getLessCompiler();
+               $compiler = ResourceLoader::getLessCompiler( $this->getConfig() );
                $result = null;
  
                $result = $compiler->cachedCompile( $source );