Namespace TitleValue under \MediaWiki\Title

One of the big ones, so doing this alone.

Bug: T166010
Change-Id: I4c901d5c32696d8334ec30cede7d9b6f3d8d645e

39 files changed, 48 insertions, 24 deletions

diff --git a/includes/Category/CategoryViewer.php b/includes/Category/CategoryViewer.php
index 02374daa69c1..f0d4f18a843f 100644
--- a/includes/Category/CategoryViewer.php
+++ b/includes/Category/CategoryViewer.php
@@ -39,8 +39,8 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MWException;
-use TitleValue;
 use Wikimedia\Rdbms\SelectQueryBuilder;
 
 class CategoryViewer extends ContextSource {
diff --git a/includes/CommentFormatter/CommentParser.php b/includes/CommentFormatter/CommentParser.php
index 75689145fb7b..fa1a73763bfa 100644
--- a/includes/CommentFormatter/CommentParser.php
+++ b/includes/CommentFormatter/CommentParser.php
@@ -15,13 +15,13 @@ use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\WikiMap\WikiMap;
 use NamespaceInfo;
 use Parser;
 use RepoGroup;
 use StringUtils;
 use TitleParser;
-use TitleValue;
 
 /**
  * The text processing backend for CommentFormatter.
diff --git a/includes/CommentFormatter/RowCommentIterator.php b/includes/CommentFormatter/RowCommentIterator.php
index 620a2e7ee765..3a0247889c40 100644
--- a/includes/CommentFormatter/RowCommentIterator.php
+++ b/includes/CommentFormatter/RowCommentIterator.php
@@ -5,7 +5,7 @@ namespace MediaWiki\CommentFormatter;
 use ArrayIterator;
 use IteratorIterator;
 use MediaWiki\CommentStore\CommentStore;
-use TitleValue;
+use MediaWiki\Title\TitleValue;
 use Traversable;
 
 /**
diff --git a/includes/Output/OutputPage.php b/includes/Output/OutputPage.php
index 74642356fee7..4415f737553d 100644
--- a/includes/Output/OutputPage.php
+++ b/includes/Output/OutputPage.php
@@ -53,6 +53,7 @@ use MediaWiki\ResourceLoader\ResourceLoader;
 use MediaWiki\Session\SessionManager;
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\Utils\MWTimestamp;
 use Message;
 use MWDebug;
@@ -66,7 +67,6 @@ use RequestContext;
 use Sanitizer;
 use Skin;
 use TextContent;
-use TitleValue;
 use Wikimedia\AtEase\AtEase;
 use Wikimedia\LightweightObjectStore\ExpirationAwareness;
 use Wikimedia\Parsoid\Core\TOCData;
diff --git a/includes/Permissions/RestrictionStore.php b/includes/Permissions/RestrictionStore.php
index 506a8a421081..ef59784cb474 100644
--- a/includes/Permissions/RestrictionStore.php
+++ b/includes/Permissions/RestrictionStore.php
@@ -16,8 +16,8 @@ use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Page\PageStore;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use stdClass;
-use TitleValue;
 use WANObjectCache;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\ILoadBalancer;
diff --git a/includes/Permissions/UserAuthority.php b/includes/Permissions/UserAuthority.php
index d107eba49c21..ef721181c8ac 100644
--- a/includes/Permissions/UserAuthority.php
+++ b/includes/Permissions/UserAuthority.php
@@ -28,8 +28,8 @@ use MediaWiki\Block\BlockErrorFormatter;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Request\WebRequest;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
-use TitleValue;
 use User;
 use Wikimedia\Assert\Assert;
 use Wikimedia\DebugInfo\DebugInfoTrait;
diff --git a/includes/ResourceLoader/UserModule.php b/includes/ResourceLoader/UserModule.php
index e073283f714e..8d70a586de50 100644
--- a/includes/ResourceLoader/UserModule.php
+++ b/includes/ResourceLoader/UserModule.php
@@ -24,7 +24,7 @@ namespace MediaWiki\ResourceLoader;
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
-use TitleValue;
+use MediaWiki\Title\TitleValue;
 
 /**
  * Module for user customizations scripts.
diff --git a/includes/ResourceLoader/UserStylesModule.php b/includes/ResourceLoader/UserStylesModule.php
index 63e165036f31..3aeee03b21fd 100644
--- a/includes/ResourceLoader/UserStylesModule.php
+++ b/includes/ResourceLoader/UserStylesModule.php
@@ -24,7 +24,7 @@ namespace MediaWiki\ResourceLoader;
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
-use TitleValue;
+use MediaWiki\Title\TitleValue;
 
 /**
  * Module for user customizations styles.
diff --git a/includes/ResourceLoader/WikiModule.php b/includes/ResourceLoader/WikiModule.php
index 0e8bcbf1e1f0..05eb9a4ba4cb 100644
--- a/includes/ResourceLoader/WikiModule.php
+++ b/includes/ResourceLoader/WikiModule.php
@@ -32,8 +32,8 @@ use MediaWiki\Page\PageIdentity;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MemoizedCallable;
-use TitleValue;
 use Wikimedia\Minify\CSSMin;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\IReadableDatabase;
diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php
index d7ba907efd20..7f26bc85e3d8 100644
--- a/includes/api/ApiQueryBase.php
+++ b/includes/api/ApiQueryBase.php
@@ -22,6 +22,7 @@
 
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IReadableDatabase;
 use Wikimedia\Rdbms\IResultWrapper;
diff --git a/includes/api/ApiQueryFilearchive.php b/includes/api/ApiQueryFilearchive.php
index 8c2bedf285de..59bc8aa5fe7d 100644
--- a/includes/api/ApiQueryFilearchive.php
+++ b/includes/api/ApiQueryFilearchive.php
@@ -29,6 +29,7 @@ use MediaWiki\CommentFormatter\CommentItem;
 use MediaWiki\CommentStore\CommentStore;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\ParamValidator\TypeDef\IntegerDef;
 
diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php
index 7f3122064674..036880623b70 100644
--- a/includes/api/ApiQueryInfo.php
+++ b/includes/api/ApiQueryInfo.php
@@ -34,6 +34,7 @@ use MediaWiki\Permissions\RestrictionStore;
 use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleFactory;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\TempUser\TempUserCreator;
 use MediaWiki\Utils\UrlUtils;
 use Wikimedia\ParamValidator\ParamValidator;
diff --git a/includes/api/ApiQueryWatchlistRaw.php b/includes/api/ApiQueryWatchlistRaw.php
index c0c48d7e4ebb..d88bb8129a54 100644
--- a/includes/api/ApiQueryWatchlistRaw.php
+++ b/includes/api/ApiQueryWatchlistRaw.php
@@ -22,6 +22,7 @@
 
 use MediaWiki\ParamValidator\TypeDef\UserDef;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\ParamValidator\TypeDef\IntegerDef;
 
diff --git a/includes/block/UnblockUser.php b/includes/block/UnblockUser.php
index 13277117535b..24ead29d9e54 100644
--- a/includes/block/UnblockUser.php
+++ b/includes/block/UnblockUser.php
@@ -27,10 +27,10 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Status\Status;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;
 use RevisionDeleteUser;
-use TitleValue;
 
 /**
  * Backend class for unblocking users
diff --git a/includes/cache/BacklinkCache.php b/includes/cache/BacklinkCache.php
index 2891d17901fb..d809a8d4baf1 100644
--- a/includes/cache/BacklinkCache.php
+++ b/includes/cache/BacklinkCache.php
@@ -34,6 +34,7 @@ use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IReadableDatabase;
diff --git a/includes/cache/LinkBatch.php b/includes/cache/LinkBatch.php
index ec1aaf889062..ce617493dc76 100644
--- a/includes/cache/LinkBatch.php
+++ b/includes/cache/LinkBatch.php
@@ -27,6 +27,7 @@ use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\ProperPageIdentity;
+use MediaWiki\Title\TitleValue;
 use Psr\Log\LoggerInterface;
 use Wikimedia\Assert\Assert;
 use Wikimedia\Rdbms\IConnectionProvider;
diff --git a/includes/cache/LinkCache.php b/includes/cache/LinkCache.php
index f8665115d2c8..c95704ecdc3f 100644
--- a/includes/cache/LinkCache.php
+++ b/includes/cache/LinkCache.php
@@ -27,6 +27,7 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageStoreRecord;
+use MediaWiki\Title\TitleValue;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index 46df7d713296..7e8b0ba6fd28 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -29,6 +29,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 
 /**
  * Object handling generic submission, CSRF protection, layout and
diff --git a/includes/linker/LinkRenderer.php b/includes/linker/LinkRenderer.php
index dda54f94cb69..5fade0979e1e 100644
--- a/includes/linker/LinkRenderer.php
+++ b/includes/linker/LinkRenderer.php
@@ -29,9 +29,9 @@ use MediaWiki\Html\Html;
 use MediaWiki\Page\PageReference;
 use MediaWiki\SpecialPage\SpecialPageFactory;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use Sanitizer;
 use TitleFormatter;
-use TitleValue;
 use Wikimedia\Assert\Assert;
 
 /**
diff --git a/includes/linker/LinkTargetStore.php b/includes/linker/LinkTargetStore.php
index ec1cefcaf2a6..abb5ac044c97 100644
--- a/includes/linker/LinkTargetStore.php
+++ b/includes/linker/LinkTargetStore.php
@@ -22,9 +22,9 @@ namespace MediaWiki\Linker;
 
 use BagOStuff;
 use InvalidArgumentException;
+use MediaWiki\Title\TitleValue;
 use RuntimeException;
 use stdClass;
-use TitleValue;
 use WANObjectCache;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IDatabase;
diff --git a/includes/linker/Linker.php b/includes/linker/Linker.php
index 6a0e97bcd72a..6dbeeb8e3d2f 100644
--- a/includes/linker/Linker.php
+++ b/includes/linker/Linker.php
@@ -40,11 +40,11 @@ use MediaWiki\Permissions\Authority;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use Message;
 use MessageLocalizer;
 use Parser;
 use RequestContext;
-use TitleValue;
 use User;
 use Wikimedia\Assert\Assert;
 use Wikimedia\IPUtils;
diff --git a/includes/page/RollbackPage.php b/includes/page/RollbackPage.php
index 12e1ccec263c..3f6bc2e49a00 100644
--- a/includes/page/RollbackPage.php
+++ b/includes/page/RollbackPage.php
@@ -34,6 +34,7 @@ use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\RevisionStore;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Storage\EditResult;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\ActorMigration;
 use MediaWiki\User\ActorNormalization;
 use MediaWiki\User\UserFactory;
@@ -42,7 +43,6 @@ use Message;
 use RecentChange;
 use StatusValue;
 use TitleFormatter;
-use TitleValue;
 use Wikimedia\Message\MessageValue;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IDatabase;
diff --git a/includes/specialpage/SpecialPage.php b/includes/specialpage/SpecialPage.php
index 0f8cce5a2009..0e144d5415b3 100644
--- a/includes/specialpage/SpecialPage.php
+++ b/includes/specialpage/SpecialPage.php
@@ -39,6 +39,7 @@ use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Request\WebRequest;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use Message;
 use MessageLocalizer;
 use MessageSpecifier;
@@ -48,7 +49,6 @@ use ReadOnlyError;
 use RequestContext;
 use SearchEngineFactory;
 use Skin;
-use TitleValue;
 use User;
 use UserNotLoggedIn;
 
diff --git a/includes/specials/SpecialAllPages.php b/includes/specials/SpecialAllPages.php
index 1bb86ca9cba1..776eff9d690f 100644
--- a/includes/specials/SpecialAllPages.php
+++ b/includes/specials/SpecialAllPages.php
@@ -31,8 +31,8 @@ use MediaWiki\Page\ExistingPageRecord;
 use MediaWiki\Page\PageStore;
 use MediaWiki\SpecialPage\IncludableSpecialPage;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use SearchEngineFactory;
-use TitleValue;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\SelectQueryBuilder;
 
diff --git a/includes/specials/SpecialEditWatchlist.php b/includes/specials/SpecialEditWatchlist.php
index fd837bd68cbd..969f23729288 100644
--- a/includes/specials/SpecialEditWatchlist.php
+++ b/includes/specials/SpecialEditWatchlist.php
@@ -48,13 +48,13 @@ use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\SpecialPage\UnlistedSpecialPage;
 use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\Watchlist\WatchlistManager;
 use NamespaceInfo;
 use OOUIHTMLForm;
 use Parser;
 use ParserOutput;
 use TitleParser;
-use TitleValue;
 use UserNotLoggedIn;
 use WatchedItemStore;
 use WatchedItemStoreInterface;
diff --git a/includes/specials/SpecialLinkSearch.php b/includes/specials/SpecialLinkSearch.php
index 6cc3176aeaeb..bf0f29501115 100644
--- a/includes/specials/SpecialLinkSearch.php
+++ b/includes/specials/SpecialLinkSearch.php
@@ -30,11 +30,11 @@ use MediaWiki\ExternalLinks\LinkFilter;
 use MediaWiki\Linker\Linker;
 use MediaWiki\MainConfigNames;
 use MediaWiki\SpecialPage\QueryPage;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\Utils\UrlUtils;
 use Parser;
 use Skin;
 use stdClass;
-use TitleValue;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IResultWrapper;
diff --git a/includes/specials/SpecialRecentChanges.php b/includes/specials/SpecialRecentChanges.php
index 831bdecba3c1..9e5233f1bf62 100644
--- a/includes/specials/SpecialRecentChanges.php
+++ b/includes/specials/SpecialRecentChanges.php
@@ -35,13 +35,13 @@ use MediaWiki\Html\Html;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\SpecialPage\ChangesListSpecialPage;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserOptionsLookup;
 use MediaWiki\Utils\MWTimestamp;
 use MessageCache;
 use OOUI\ButtonWidget;
 use OOUI\HtmlSnippet;
 use RecentChange;
-use TitleValue;
 use WatchedItemStoreInterface;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IReadableDatabase;
diff --git a/includes/specials/SpecialUnblock.php b/includes/specials/SpecialUnblock.php
index 3b519668ed94..be932f4f999f 100644
--- a/includes/specials/SpecialUnblock.php
+++ b/includes/specials/SpecialUnblock.php
@@ -31,11 +31,11 @@ use MediaWiki\Block\UnblockUserFactory;
 use MediaWiki\Request\WebRequest;
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserNamePrefixSearch;
 use MediaWiki\User\UserNameUtils;
 use MediaWiki\Watchlist\WatchlistManager;
-use TitleValue;
 use Wikimedia\IPUtils;
 
 /**
diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 9b900651e61a..01eea5d5b709 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -37,11 +37,11 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Request\DerivativeRequest;
 use MediaWiki\SpecialPage\ChangesListSpecialPage;
 use MediaWiki\SpecialPage\SpecialPage;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserOptionsLookup;
 use MediaWiki\Watchlist\WatchlistManager;
 use RecentChange;
-use TitleValue;
 use UserNotLoggedIn;
 use WatchedItem;
 use WatchedItemStoreInterface;
diff --git a/includes/specials/pagers/CategoryPager.php b/includes/specials/pagers/CategoryPager.php
index 313d6895ba6d..bd31198a4325 100644
--- a/includes/specials/pagers/CategoryPager.php
+++ b/includes/specials/pagers/CategoryPager.php
@@ -27,7 +27,7 @@ use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\Html\Html;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Title\Title;
-use TitleValue;
+use MediaWiki\Title\TitleValue;
 use Wikimedia\Rdbms\IConnectionProvider;
 
 /**
diff --git a/includes/specials/pagers/NewFilesPager.php b/includes/specials/pagers/NewFilesPager.php
index 0191e0911097..4bfc17e47087 100644
--- a/includes/specials/pagers/NewFilesPager.php
+++ b/includes/specials/pagers/NewFilesPager.php
@@ -30,8 +30,8 @@ use MediaWiki\Html\FormOptions;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Permissions\GroupPermissionsLookup;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use RecentChange;
-use TitleValue;
 use Wikimedia\Rdbms\IConnectionProvider;
 
 /**
diff --git a/includes/title/MediaWikiTitleCodec.php b/includes/title/MediaWikiTitleCodec.php
index 868fef62746f..aec36b40d005 100644
--- a/includes/title/MediaWikiTitleCodec.php
+++ b/includes/title/MediaWikiTitleCodec.php
@@ -25,6 +25,7 @@ use MediaWiki\Interwiki\InterwikiLookup;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use Wikimedia\IPUtils;
 
 /**
diff --git a/includes/title/NamespaceInfo.php b/includes/title/NamespaceInfo.php
index d7046b513a9b..7024d18f49d8 100644
--- a/includes/title/NamespaceInfo.php
+++ b/includes/title/NamespaceInfo.php
@@ -25,6 +25,7 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Title\TitleValue;
 
 /**
  * This is a utility class for dealing with namespaces that encodes all the "magic" behaviors of
diff --git a/includes/title/Title.php b/includes/title/Title.php
index 6d54aa039030..129109dd033a 100644
--- a/includes/title/Title.php
+++ b/includes/title/Title.php
@@ -63,7 +63,6 @@ use RuntimeException;
 use Sanitizer;
 use stdClass;
 use TitleFormatter;
-use TitleValue;
 use Wikimedia\Assert\Assert;
 use Wikimedia\Assert\PreconditionException;
 use Wikimedia\Rdbms\IDatabase;
diff --git a/includes/title/TitleParser.php b/includes/title/TitleParser.php
index 0ce5ece015ac..f14fc110c805 100644
--- a/includes/title/TitleParser.php
+++ b/includes/title/TitleParser.php
@@ -21,6 +21,8 @@
  * @author Daniel Kinzler
  */
 
+use MediaWiki\Title\TitleValue;
+
 /**
  * A title parser service for %MediaWiki.
  *
diff --git a/includes/title/TitleValue.php b/includes/title/TitleValue.php
index f4282268d9a1..e734dad7e834 100644
--- a/includes/title/TitleValue.php
+++ b/includes/title/TitleValue.php
@@ -20,6 +20,10 @@
  * @file
  * @author Daniel Kinzler
  */
+
+namespace MediaWiki\Title;
+
+use InvalidArgumentException;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Page\PageReference;
 use Wikimedia\Assert\Assert;
@@ -262,3 +266,9 @@ class TitleValue implements LinkTarget {
 			&& ( $other->getFragment() === $this->getFragment() );
 	}
 }
+
+/**
+ * Retain the old class name for backwards compatibility.
+ * @deprecated since 1.41
+ */
+class_alias( TitleValue::class, 'TitleValue' );
diff --git a/includes/watcheditem/WatchedItem.php b/includes/watcheditem/WatchedItem.php
index 75f8222140f1..6dae9db2e37f 100644
--- a/includes/watcheditem/WatchedItem.php
+++ b/includes/watcheditem/WatchedItem.php
@@ -21,6 +21,7 @@
 
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Page\PageIdentity;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\Utils\MWTimestamp;
 use Wikimedia\ParamValidator\TypeDef\ExpiryDef;
diff --git a/includes/watcheditem/WatchedItemQueryService.php b/includes/watcheditem/WatchedItemQueryService.php
index 9c6ba1ea2226..ac3df15cbd9d 100644
--- a/includes/watcheditem/WatchedItemQueryService.php
+++ b/includes/watcheditem/WatchedItemQueryService.php
@@ -6,6 +6,7 @@ use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserOptionsLookup;
 use Wikimedia\Assert\Assert;
diff --git a/includes/watcheditem/WatchedItemStore.php b/includes/watcheditem/WatchedItemStore.php
index 12174a0d6ccc..164804c206a6 100644
--- a/includes/watcheditem/WatchedItemStore.php
+++ b/includes/watcheditem/WatchedItemStore.php
@@ -7,6 +7,7 @@ use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Revision\RevisionLookup;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\Utils\MWTimestamp;
 use Wikimedia\Assert\Assert;