Merge "Replace deprecated Context::getStats() with MWServices::getStatsdDataFactory()"

diff --combined includes/resourceloader/ResourceLoaderModule.php
index 5b862e4,b122fe2..5404e0f
--- 1/includes/resourceloader/ResourceLoaderModule.php
--- 2/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@@ -147,8 -147,8 +147,8 @@@ abstract class ResourceLoaderModule imp
                if ( $deprecationInfo ) {
                        $name = $this->getName();
                        $warning = 'This page is using the deprecated ResourceLoader module "' . $name . '".';
 -                      if ( !is_bool( $deprecationInfo ) && isset( $deprecationInfo['message'] ) ) {
 -                              $warning .= "\n" . $deprecationInfo['message'];
 +                      if ( is_string( $deprecationInfo ) ) {
 +                              $warning .= "\n" . $deprecationInfo;
                        }
                        return Xml::encodeJsCall(
                                'mw.log.warn',
@@@ -624,7 -624,7 +624,7 @@@
         */
        final protected function buildContent( ResourceLoaderContext $context ) {
                $rl = $context->getResourceLoader();
-               $stats = RequestContext::getMain()->getStats();
+               $stats = MediaWikiServices::getInstance()->getStatsdDataFactory();
                $statStart = microtime( true );
  
                // Only include properties that are relevant to this context (e.g. only=scripts)