Move list of core namespaces to NamespaceInfo

It is sometimes necessary to get an unmodified list of namespaces that are in
core.

Bug: T226657
Change-Id: I8e4ed19db915a1673c27ca5b212d712d079b4bba

diff --git a/includes/Setup.php b/includes/Setup.php
index 4202985..201e1a9 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -483,25 +483,7 @@ $wgMinUploadChunkSize = min(
  * Definitions of the NS_ constants are in Defines.php
  * @private
  */
-$wgCanonicalNamespaceNames = [
-       NS_MEDIA            => 'Media',
-       NS_SPECIAL          => 'Special',
-       NS_TALK             => 'Talk',
-       NS_USER             => 'User',
-       NS_USER_TALK        => 'User_talk',
-       NS_PROJECT          => 'Project',
-       NS_PROJECT_TALK     => 'Project_talk',
-       NS_FILE             => 'File',
-       NS_FILE_TALK        => 'File_talk',
-       NS_MEDIAWIKI        => 'MediaWiki',
-       NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
-       NS_TEMPLATE         => 'Template',
-       NS_TEMPLATE_TALK    => 'Template_talk',
-       NS_HELP             => 'Help',
-       NS_HELP_TALK        => 'Help_talk',
-       NS_CATEGORY         => 'Category',
-       NS_CATEGORY_TALK    => 'Category_talk',
-];
+$wgCanonicalNamespaceNames = NamespaceInfo::$canonicalNames;
 
 /// @todo UGLY UGLY
 if ( is_array( $wgExtraNamespaces ) ) {

diff --git a/includes/title/NamespaceInfo.php b/includes/title/NamespaceInfo.php
index 2ed8729..7307cc1 100644 (file)
--- a/includes/title/NamespaceInfo.php
+++ b/includes/title/NamespaceInfo.php
@@ -50,6 +50,34 @@ class NamespaceInfo {
        /** @var ServiceOptions */
        private $options;
 
+       /**
+        * Definitions of the NS_ constants are in Defines.php
+        *
+        * @todo Make this const when HHVM support is dropped (T192166)
+        *
+        * @var array
+        * @internal
+        */
+       public static $canonicalNames = [
+               NS_MEDIA            => 'Media',
+               NS_SPECIAL          => 'Special',
+               NS_TALK             => 'Talk',
+               NS_USER             => 'User',
+               NS_USER_TALK        => 'User_talk',
+               NS_PROJECT          => 'Project',
+               NS_PROJECT_TALK     => 'Project_talk',
+               NS_FILE             => 'File',
+               NS_FILE_TALK        => 'File_talk',
+               NS_MEDIAWIKI        => 'MediaWiki',
+               NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
+               NS_TEMPLATE         => 'Template',
+               NS_TEMPLATE_TALK    => 'Template_talk',
+               NS_HELP             => 'Help',
+               NS_HELP_TALK        => 'Help_talk',
+               NS_CATEGORY         => 'Category',
+               NS_CATEGORY_TALK    => 'Category_talk',
+       ];
+
        /**
         * TODO Make this const when HHVM support is dropped (T192166)
         *
@@ -642,4 +670,15 @@ class NamespaceInfo {
                        return 'page';
                }
        }
+
+       /**
+        * Retrieve the indexes for the namespaces defined by core.
+        *
+        * @since 1.34
+        *
+        * @return int[]
+        */
+       public static function getCommonNamespaces() {
+               return array_keys( self::$canonicalNames );
+       }
 }