Merge "Update Parser to use NamespaceInfo"

diff --combined includes/ServiceWiring.php
index a952298,3543ff8..1eb3551
--- 1/includes/ServiceWiring.php
--- 2/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@@ -138,10 -138,6 +138,10 @@@ return 
                return new CryptRand();
        },
  
 +      'DateFormatterFactory' => function () : DateFormatterFactory {
 +              return new DateFormatterFactory;
 +      },
 +
        'DBLoadBalancer' => function ( MediaWikiServices $services ) : Wikimedia\Rdbms\LoadBalancer {
                // just return the default LB from the DBLoadBalancerFactory service
                return $services->getDBLoadBalancerFactory()->getMainLB();
@@@ -334,10 -330,6 +334,10 @@@
                return new MimeAnalyzer( $params );
        },
  
 +      'NamespaceInfo' => function ( MediaWikiServices $services ) : NamespaceInfo {
 +              return new NamespaceInfo( $services->getMainConfig() );
 +      },
 +
        'NameTableStoreFactory' => function ( MediaWikiServices $services ) : NameTableStoreFactory {
                return new NameTableStoreFactory(
                        $services->getDBLoadBalancerFactory(),
@@@ -346,6 -338,10 +346,6 @@@
                );
        },
  
 -      'NamespaceInfo' => function ( MediaWikiServices $services ) : NamespaceInfo {
 -              return new NamespaceInfo( $services->getMainConfig() );
 -      },
 -
        'OldRevisionImporter' => function ( MediaWikiServices $services ) : OldRevisionImporter {
                return new ImportableOldRevisionImporter(
                        true,
@@@ -377,7 -373,8 +377,8 @@@
                        wfUrlProtocols(),
                        $services->getSpecialPageFactory(),
                        $services->getMainConfig(),
-                       $services->getLinkRendererFactory()
+                       $services->getLinkRendererFactory(),
+                       $services->getNamespaceInfo()
                );
        },
  
@@@ -406,9 -403,7 +407,9 @@@
                        $config->get( 'WhitelistRead' ),
                        $config->get( 'WhitelistReadRegexp' ),
                        $config->get( 'EmailConfirmToEdit' ),
 -                      $config->get( 'BlockDisablesLogin' ) );
 +                      $config->get( 'BlockDisablesLogin' ),
 +                      $services->getNamespaceInfo()
 +              );
        },
  
        'PreferencesFactory' => function ( MediaWikiServices $services ) : PreferencesFactory {
@@@ -577,13 -572,8 +578,13 @@@
        },
  
        'SpecialPageFactory' => function ( MediaWikiServices $services ) : SpecialPageFactory {
 +              $config = $services->getMainConfig();
 +              $options = [];
 +              foreach ( SpecialPageFactory::$constructorOptions as $key ) {
 +                      $options[$key] = $config->get( $key );
 +              }
                return new SpecialPageFactory(
 -                      $services->getMainConfig(),
 +                      $options,
                        $services->getContentLanguage()
                );
        },