Merge "Use HttpStatus::header instead of manually crafting header()"

diff --combined includes/resourceloader/ResourceLoader.php
index 114a34f,35311d1..7cd0d19
--- 1/includes/resourceloader/ResourceLoader.php
--- 2/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@@ -22,17 -22,13 +22,17 @@@
   * @author Trevor Parscal
   */
  
 +use Psr\Log\LoggerAwareInterface;
 +use Psr\Log\LoggerInterface;
 +use Psr\Log\NullLogger;
 +
  /**
   * Dynamic JavaScript and CSS resource loading system.
   *
   * Most of the documentation is on the MediaWiki documentation wiki starting at:
   *    https://www.mediawiki.org/wiki/ResourceLoader
   */
 -class ResourceLoader {
 +class ResourceLoader implements LoggerAwareInterface {
        /** @var int */
        protected static $filterCacheVersion = 7;
  
@@@ -81,11 -77,6 +81,11 @@@
         */
        protected $blobStore;
  
 +      /**
 +       * @var LoggerInterface
 +       */
 +      private $logger;
 +
        /**
         * Load information stored in the database about modules.
         *
@@@ -197,7 -188,7 +197,7 @@@
                }
  
                if ( !in_array( $filter, array( 'minify-js', 'minify-css' ) ) ) {
 -                      wfDebugLog( 'resourceloader', __METHOD__ . ": Invalid filter: $filter" );
 +                      $this->logger->info( __METHOD__ . ": Invalid filter: $filter" );
                        return $data;
                }
  
@@@ -221,7 -212,7 +221,7 @@@
                                $cache->set( $key, $result );
                        } catch ( Exception $e ) {
                                MWExceptionHandler::logException( $e );
 -                              wfDebugLog( 'resourceloader', __METHOD__ . ": minification failed: $e" );
 +                              $this->logger->info( __METHOD__ . ": minification failed: $e" );
                                $this->errors[] = self::formatExceptionNoComment( $e );
                        }
                }
@@@ -248,18 -239,14 +248,18 @@@
         * Register core modules and runs registration hooks.
         * @param Config|null $config
         */
 -      public function __construct( Config $config = null ) {
 +      public function __construct( Config $config = null, LoggerInterface $logger = null ) {
                global $IP;
  
 -              if ( $config === null ) {
 -                      wfDebug( __METHOD__ . ' was called without providing a Config instance' );
 -                      $config = ConfigFactory::getDefaultInstance()->makeConfig( 'main' );
 +              if ( !$logger ) {
 +                      $logger = new NullLogger();
                }
 +              $this->setLogger( $logger );
  
 +              if ( !$config ) {
 +                      $this->logger->info( __METHOD__ . ' was called without providing a Config instance' );
 +                      $config = ConfigFactory::getDefaultInstance()->makeConfig( 'main' );
 +              }
                $this->config = $config;
  
                // Add 'local' source first
@@@ -289,10 -276,6 +289,10 @@@
                return $this->config;
        }
  
 +      public function setLogger( LoggerInterface $logger ) {
 +              $this->logger = $logger;
 +      }
 +
        /**
         * @param MessageBlobStore $blobStore
         * @since 1.25
@@@ -650,7 -633,7 +650,7 @@@
                                // Do not allow private modules to be loaded from the web.
                                // This is a security issue, see bug 34907.
                                if ( $module->getGroup() === 'private' ) {
 -                                      wfDebugLog( 'resourceloader', __METHOD__ . ": request for private module '$name' denied" );
 +                                      $this->logger->info( __METHOD__ . ": request for private module '$name' denied" );
                                        $this->errors[] = "Cannot show private module \"$name\"";
                                        continue;
                                }
@@@ -665,7 -648,7 +665,7 @@@
                        $this->preloadModuleInfo( array_keys( $modules ), $context );
                } catch ( Exception $e ) {
                        MWExceptionHandler::logException( $e );
 -                      wfDebugLog( 'resourceloader', __METHOD__ . ": preloading module info failed: $e" );
 +                      $this->logger->info( __METHOD__ . ": preloading module info failed: $e" );
                        $this->errors[] = self::formatExceptionNoComment( $e );
                }
  
@@@ -675,7 -658,7 +675,7 @@@
                        $versionHash = $this->getCombinedVersion( $context, array_keys( $modules ) );
                } catch ( Exception $e ) {
                        MWExceptionHandler::logException( $e );
 -                      wfDebugLog( 'resourceloader', __METHOD__ . ": calculating version hash failed: $e" );
 +                      $this->logger->info( __METHOD__ . ": calculating version hash failed: $e" );
                        $this->errors[] = self::formatExceptionNoComment( $e );
                }
  
@@@ -821,8 -804,7 +821,7 @@@
                        // sending the 304.
                        wfResetOutputBuffers( /* $resetGzipEncoding = */ true );
  
-                       header( 'HTTP/1.0 304 Not Modified' );
-                       header( 'Status: 304 Not Modified' );
+                       HttpStatus::header( 304 );
  
                        $this->sendResponseHeaders( $context, $etag, false );
                        return true;
@@@ -958,7 -940,8 +957,7 @@@ MESSAGE
                                $blobs = $this->blobStore->get( $this, $modules, $context->getLanguage() );
                        } catch ( Exception $e ) {
                                MWExceptionHandler::logException( $e );
 -                              wfDebugLog(
 -                                      'resourceloader',
 +                              $this->logger->info(
                                        __METHOD__ . ": pre-fetching blobs from MessageBlobStore failed: $e"
                                );
                                $this->errors[] = self::formatExceptionNoComment( $e );
@@@ -1073,7 -1056,7 +1072,7 @@@
                                }
                        } catch ( Exception $e ) {
                                MWExceptionHandler::logException( $e );
 -                              wfDebugLog( 'resourceloader', __METHOD__ . ": generating module package failed: $e" );
 +                              $this->logger->info( __METHOD__ . ": generating module package failed: $e" );
                                $this->errors[] = self::formatExceptionNoComment( $e );
  
                                // Respond to client with error-state instead of module implementation