Merge "resourceloader: Merge $fileCache conditional blocks"

diff --combined includes/resourceloader/ResourceLoader.php
index 2336a37,4427a53..b05068c
--- 1/includes/resourceloader/ResourceLoader.php
--- 2/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@@ -58,10 -58,11 +58,10 @@@ class ResourceLoader implements LoggerA
        protected $config;
  
        /**
 -       * Associative array mapping framework ids to a list of names of test suite modules
 -       * like [ 'qunit' => [ 'mediawiki.tests.qunit.suites', 'ext.foo.tests', ... ], ... ]
 -       * @var array
 +       * List of module names that contain QUnit test suites
 +       * @var string[]
         */
 -      protected $testModuleNames = [];
 +      protected $testSuiteModuleNames = [];
  
        /**
         * E.g. [ 'source-id' => 'http://.../load.php' ]
@@@ -373,7 -374,6 +373,7 @@@
  
        /**
         * @internal For use by ServiceWiring only
 +       * @codeCoverageIgnore
         */
        public function registerTestModules() {
                global $IP;
@@@ -384,37 -384,39 +384,37 @@@
                                . 'Edit your <code>LocalSettings.php</code> to enable it.' );
                }
  
 -              $testModules = [
 -                      'qunit' => [],
 -              ];
 +              // This has a 'qunit' key for compat with the below hook.
 +              $testModulesMeta = [ 'qunit' => [] ];
  
                // Get test suites from extensions
                // Avoid PHP 7.1 warning from passing $this by reference
                $rl = $this;
 -              Hooks::run( 'ResourceLoaderTestModules', [ &$testModules, &$rl ] );
 +              Hooks::run( 'ResourceLoaderTestModules', [ &$testModulesMeta, &$rl ] );
                $extRegistry = ExtensionRegistry::getInstance();
                // In case of conflict, the deprecated hook has precedence.
 -              $testModules['qunit'] += $extRegistry->getAttribute( 'QUnitTestModules' );
 +              $testModules = $testModulesMeta['qunit'] + $extRegistry->getAttribute( 'QUnitTestModules' );
  
 -              // Add the QUnit testrunner as implicit dependency to extension test suites.
 -              foreach ( $testModules['qunit'] as &$module ) {
 -                      // Shuck any single-module dependency as an array
 +              $testSuiteModuleNames = [];
 +              foreach ( $testModules as $name => &$module ) {
 +                      // Turn any single-module dependency into an array
                        if ( isset( $module['dependencies'] ) && is_string( $module['dependencies'] ) ) {
                                $module['dependencies'] = [ $module['dependencies'] ];
                        }
  
 +                      // Ensure the testrunner loads before any test suites
                        $module['dependencies'][] = 'test.mediawiki.qunit.testrunner';
 -              }
  
 -              // Get core test suites
 -              $testModules['qunit'] =
 -                      ( include "$IP/tests/qunit/QUnitTestResources.php" ) + $testModules['qunit'];
 +                      // Keep track of the test suites to load on SpecialJavaScriptTest
 +                      $testSuiteModuleNames[] = $name;
 +              }
  
 -              foreach ( $testModules as $id => $names ) {
 -                      // Register test modules
 -                      $this->register( $testModules[$id] );
 +              // Core test suites (their names have further precedence).
 +              $testModules = ( include "$IP/tests/qunit/QUnitTestResources.php" ) + $testModules;
 +              $testSuiteModuleNames[] = 'test.mediawiki.qunit.suites';
  
 -                      // Keep track of their names so that they can be loaded together
 -                      $this->testModuleNames[$id] = array_keys( $testModules[$id] );
 -              }
 +              $this->register( $testModules );
 +              $this->testSuiteModuleNames = $testSuiteModuleNames;
        }
  
        /**
@@@ -468,14 -470,26 +468,14 @@@
        }
  
        /**
 -       * Get a list of test module names for one (or all) frameworks.
 +       * Get a list of module names with QUnit test suites.
         *
 -       * If the given framework id is unknkown, or if the in-object variable is not an array,
 -       * then it will return an empty array.
 -       *
 -       * @param string $framework Get only the test module names for one
 -       *   particular framework (optional)
 +       * @internal For use by SpecialJavaScriptTest only
         * @return array
 +       * @codeCoverageIgnore
         */
 -      public function getTestModuleNames( $framework = 'all' ) {
 -              /** @todo api siteinfo prop testmodulenames modulenames */
 -              if ( $framework == 'all' ) {
 -                      return $this->testModuleNames;
 -              } elseif ( isset( $this->testModuleNames[$framework] )
 -                      && is_array( $this->testModuleNames[$framework] )
 -              ) {
 -                      return $this->testModuleNames[$framework];
 -              } else {
 -                      return [];
 -              }
 +      public function getTestSuiteModuleNames() {
 +              return $this->testSuiteModuleNames;
        }
  
        /**
@@@ -725,6 -739,8 +725,8 @@@
                        if ( $this->tryRespondFromFileCache( $fileCache, $context, $etag ) ) {
                                return; // output handled
                        }
+               } else {
+                       $fileCache = null;
                }
  
                // Generate a response
@@@ -739,15 -755,17 +741,17 @@@
                        }
                }
  
-               // Save response to file cache unless there are errors
-               if ( isset( $fileCache ) && !$this->errors && $missing === [] ) {
-                       // Cache single modules and images...and other requests if there are enough hits
-                       if ( ResourceFileCache::useFileCache( $context ) ) {
-                               if ( $fileCache->isCacheWorthy() ) {
-                                       $fileCache->saveText( $response );
-                               } else {
-                                       $fileCache->incrMissesRecent( $context->getRequest() );
-                               }
+               // Consider saving the response to file cache (unless there are errors).
+               if ( $fileCache &&
+                       !$this->errors &&
+                       $missing === [] &&
+                       ResourceFileCache::useFileCache( $context )
+               ) {
+                       if ( $fileCache->isCacheWorthy() ) {
+                               // There were enough hits, save the response to the cache
+                               $fileCache->saveText( $response );
+                       } else {
+                               $fileCache->incrMissesRecent( $context->getRequest() );
                        }
                }