Merge "Update LinkCache to use NamespaceInfo"

diff --combined includes/ServiceWiring.php
index 9836736,9be85eb..a7193d1
--- 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' =>
@@@ -231,7 -231,8 +231,8 @@@
        'LinkCache' => function ( MediaWikiServices $services ) : LinkCache {
                return new LinkCache(
                        $services->getTitleFormatter(),
-                       $services->getMainWANObjectCache()
+                       $services->getMainWANObjectCache(),
+                       $services->getNamespaceInfo()
                );
        },
  
@@@ -363,8 -364,7 +364,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 {
@@@ -461,8 -461,7 +462,8 @@@
                                DefaultPreferencesFactory::$constructorOptions, $services->getMainConfig() ),
                        $services->getContentLanguage(),
                        AuthManager::singleton(),
 -                      $services->getLinkRendererFactory()->create()
 +                      $services->getLinkRendererFactory()->create(),
 +                      $services->getNamespaceInfo()
                );
                $factory->setLogger( LoggerFactory::getInstance( 'preferences' ) );
  
@@@ -484,15 -483,6 +485,15 @@@
                );
        },
  
 +      'RepoGroup' => function ( MediaWikiServices $services ) : RepoGroup {
 +              $config = $services->getMainConfig();
 +              return new RepoGroup(
 +                      $config->get( 'LocalFileRepo' ),
 +                      $config->get( 'ForeignFileRepos' ),
 +                      $services->getMainWANObjectCache()
 +              );
 +      },
 +
        'ResourceLoader' => function ( MediaWikiServices $services ) : ResourceLoader {
                // @todo This should not take a Config object, but it's not so easy to remove because it
                // exposes it in a getter, which is actually used.

diff --combined includes/cache/LinkCache.php
index 33feee2,eb94f9d..1bcf948
--- 1/includes/cache/LinkCache.php
--- 2/includes/cache/LinkCache.php
+++ b/includes/cache/LinkCache.php
@@@ -45,17 -45,29 +45,29 @@@ class LinkCache 
        /** @var TitleFormatter */
        private $titleFormatter;
  
+       /** @var NamespaceInfo */
+       private $nsInfo;
+ 
        /**
         * How many Titles to store. There are two caches, so the amount actually
         * stored in memory can be up to twice this.
         */
        const MAX_SIZE = 10000;
  
-       public function __construct( TitleFormatter $titleFormatter, WANObjectCache $cache ) {
+       public function __construct(
+               TitleFormatter $titleFormatter,
+               WANObjectCache $cache,
+               NamespaceInfo $nsInfo = null
+       ) {
+               if ( !$nsInfo ) {
+                       wfDeprecated( __METHOD__ . ' with no NamespaceInfo argument', '1.34' );
+                       $nsInfo = MediaWikiServices::getInstance()->getNamespaceInfo();
+               }
                $this->goodLinks = new MapCacheLRU( self::MAX_SIZE );
                $this->badLinks = new MapCacheLRU( self::MAX_SIZE );
                $this->wanCache = $cache;
                $this->titleFormatter = $titleFormatter;
+               $this->nsInfo = $nsInfo;
        }
  
        /**
@@@ -231,7 -243,9 +243,7 @@@
         */
        public function addLinkObj( LinkTarget $nt ) {
                $key = $this->titleFormatter->getPrefixedDBkey( $nt );
 -              if ( $this->isBadLink( $key ) || $nt->isExternal()
 -                      || $nt->inNamespace( NS_SPECIAL )
 -              ) {
 +              if ( $this->isBadLink( $key ) || $nt->isExternal() || $nt->getNamespace() < 0 ) {
                        return 0;
                }
                $id = $this->getGoodLinkID( $key );
@@@ -298,11 -312,11 +310,11 @@@
                        return true;
                }
                // Focus on transcluded pages more than the main content
-               if ( MWNamespace::isContent( $ns ) ) {
+               if ( $this->nsInfo->isContent( $ns ) ) {
                        return false;
                }
                // Non-talk extension namespaces (e.g. NS_MODULE)
-               return ( $ns >= 100 && MWNamespace::isSubject( $ns ) );
+               return ( $ns >= 100 && $this->nsInfo->isSubject( $ns ) );
        }
  
        private function fetchPageRow( IDatabase $db, LinkTarget $nt ) {