Merge "Don't pass Config to NamespaceInfo"

diff --combined includes/ServiceWiring.php
index e10e4bb,73e64aa..44ab5e2
--- 1/includes/ServiceWiring.php
--- 2/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@@ -208,7 -208,7 +208,7 @@@ return 
        },
  
        'GenderCache' => function ( MediaWikiServices $services ) : GenderCache {
 -              return new GenderCache();
 +              return new GenderCache( $services->getNamespaceInfo() );
        },
  
        'HttpRequestFactory' =>
@@@ -363,7 -363,8 +363,8 @@@
        },
  
        'NamespaceInfo' => function ( MediaWikiServices $services ) : NamespaceInfo {
-               return new NamespaceInfo( $services->getMainConfig() );
+               return new NamespaceInfo( new ServiceOptions( NamespaceInfo::$constructorOptions,
+                       $services->getMainConfig() ) );
        },
  
        'NameTableStoreFactory' => function ( MediaWikiServices $services ) : NameTableStoreFactory {
@@@ -460,8 -461,7 +461,8 @@@
                                DefaultPreferencesFactory::$constructorOptions, $services->getMainConfig() ),
                        $services->getContentLanguage(),
                        AuthManager::singleton(),
 -                      $services->getLinkRendererFactory()->create()
 +                      $services->getLinkRendererFactory()->create(),
 +                      $services->getNamespaceInfo()
                );
                $factory->setLogger( LoggerFactory::getInstance( 'preferences' ) );