Namespace NamespaceInfo under \MediaWiki\Title

One of the big ones, so doing this alone.

Bug: T166010
Change-Id: Ibe103cd362535d3cb94cb8931e95fc74099d1497

5 files changed, 14 insertions, 1 deletions

diff --git a/includes/title/MediaWikiTitleCodec.php b/includes/title/MediaWikiTitleCodec.php
index aec36b40d005..439b9a142188 100644
--- a/includes/title/MediaWikiTitleCodec.php
+++ b/includes/title/MediaWikiTitleCodec.php
@@ -24,6 +24,7 @@
 use MediaWiki\Interwiki\InterwikiLookup;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Page\PageReference;
+use MediaWiki\Title\NamespaceInfo;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleValue;
 use Wikimedia\IPUtils;
diff --git a/includes/title/NaiveImportTitleFactory.php b/includes/title/NaiveImportTitleFactory.php
index 0ab4707da482..d6424c34f84c 100644
--- a/includes/title/NaiveImportTitleFactory.php
+++ b/includes/title/NaiveImportTitleFactory.php
@@ -18,6 +18,7 @@
  * @file
  */
 
+use MediaWiki\Title\NamespaceInfo;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleFactory;
 
diff --git a/includes/title/NamespaceImportTitleFactory.php b/includes/title/NamespaceImportTitleFactory.php
index 8829bdd0c575..4a782b85a80b 100644
--- a/includes/title/NamespaceImportTitleFactory.php
+++ b/includes/title/NamespaceImportTitleFactory.php
@@ -18,6 +18,7 @@
  * @file
  */
 
+use MediaWiki\Title\NamespaceInfo;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleFactory;
 
diff --git a/includes/title/NamespaceInfo.php b/includes/title/NamespaceInfo.php
index 7024d18f49d8..61fb2516d3fb 100644
--- a/includes/title/NamespaceInfo.php
+++ b/includes/title/NamespaceInfo.php
@@ -20,12 +20,15 @@
  * @file
  */
 
+namespace MediaWiki\Title;
+
+use InvalidArgumentException;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
-use MediaWiki\Title\TitleValue;
+use MWException;
 
 /**
  * This is a utility class for dealing with namespaces that encodes all the "magic" behaviors of
@@ -638,3 +641,9 @@ class NamespaceInfo {
 		return array_keys( self::CANONICAL_NAMES );
 	}
 }
+
+/**
+ * Retain the old class name for backwards compatibility.
+ * @deprecated since 1.41
+ */
+class_alias( NamespaceInfo::class, 'NamespaceInfo' );
diff --git a/includes/title/SubpageImportTitleFactory.php b/includes/title/SubpageImportTitleFactory.php
index 211a1b3c6dc7..e364cd0451d3 100644
--- a/includes/title/SubpageImportTitleFactory.php
+++ b/includes/title/SubpageImportTitleFactory.php
@@ -18,6 +18,7 @@
  * @file
  */
 
+use MediaWiki\Title\NamespaceInfo;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleFactory;