Merge "Fix PerDbnameStatsdDataFactory metric prefix"

diff --combined includes/ServiceWiring.php
index f048303,66d8401..66b4c0c
--- 1/includes/ServiceWiring.php
--- 2/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@@ -38,7 -38,6 +38,7 @@@
   */
  
  use MediaWiki\Auth\AuthManager;
 +use MediaWiki\Config\ConfigRepository;
  use MediaWiki\Interwiki\ClassicInterwikiLookup;
  use MediaWiki\Linker\LinkRendererFactory;
  use MediaWiki\Logger\LoggerFactory;
@@@ -105,10 -104,6 +105,10 @@@ return 
                return $factory;
        },
  
 +      'ConfigRepository' => function ( MediaWikiServices $services ) {
 +              return new ConfigRepository( $services->getConfigFactory() );
 +      },
 +
        'MainConfig' => function ( MediaWikiServices $services ) {
                // Use the 'main' config from the ConfigFactory service.
                return $services->getConfigFactory()->makeConfig( 'main' );
@@@ -137,7 -132,7 +137,7 @@@
                $config = $services->getMainConfig();
                $wiki = $config->get( 'DBname' );
                return new BufferingStatsdDataFactory(
-                       rtrim( $services->getMainConfig()->get( 'StatsdMetricPrefix' ), '.' ) . $wiki
+                       rtrim( $services->getMainConfig()->get( 'StatsdMetricPrefix' ) ) . '.' . $wiki
                );
        },
  
@@@ -301,8 -296,7 +301,8 @@@
  
        'Parser' => function ( MediaWikiServices $services ) {
                $conf = $services->getMainConfig()->get( 'ParserConf' );
 -              return ObjectFactory::constructClassInstance( $conf['class'], [ $conf ] );
 +              return ObjectFactory::constructClassInstance( $conf['class'],
 +                      [ $conf, $services->getMagicWordFactory() ] );
        },
  
        'ParserCache' => function ( MediaWikiServices $services ) {
@@@ -601,11 -595,6 +601,11 @@@
                );
        },
  
 +      'MagicWordFactory' => function ( MediaWikiServices $services ) {
 +              global $wgContLang;
 +              return new MagicWordFactory( $wgContLang );
 +      },
 +
        ///////////////////////////////////////////////////////////////////////////
        // NOTE: When adding a service here, don't forget to add a getter function
        // in the MediaWikiServices class. The convenience getter should just call