Reorg: Move Title-related classes to title/

These three classes:
 - TitleArray
 - TitleArrayFromResult
 - TitleFactory

We need to move these and the rest of files under title/ to Title/ (and
namespace them) but the patch will become way too big given that Title class is
also one of them.

Bug: T321882
Change-Id: Iac1688172ee457348a08a470c86e047571feb8e0

autoload.php

@@ -1918,6 +1918,9 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Tidy\\RemexDriver' => __DIR__ . '/includes/tidy/RemexDriver.php',
 	'MediaWiki\\Tidy\\RemexMungerData' => __DIR__ . '/includes/tidy/RemexMungerData.php',
 	'MediaWiki\\Tidy\\TidyDriverBase' => __DIR__ . '/includes/tidy/TidyDriverBase.php',
+	'MediaWiki\\Title\\TitleArray' => __DIR__ . '/includes/title/TitleArray.php',
+	'MediaWiki\\Title\\TitleArrayFromResult' => __DIR__ . '/includes/title/TitleArrayFromResult.php',
+	'MediaWiki\\Title\\TitleFactory' => __DIR__ . '/includes/title/TitleFactory.php',
 	'MediaWiki\\User\\ActorCache' => __DIR__ . '/includes/user/ActorCache.php',
 	'MediaWiki\\User\\ActorNormalization' => __DIR__ . '/includes/user/ActorNormalization.php',
 	'MediaWiki\\User\\ActorStore' => __DIR__ . '/includes/user/ActorStore.php',
@@ -2542,10 +2545,10 @@ $wgAutoloadLocalClasses = [
 	'TiffHandler' => __DIR__ . '/includes/media/TiffHandler.php',
 	'Timing' => __DIR__ . '/includes/libs/Timing.php',
 	'Title' => __DIR__ . '/includes/title/Title.php',
-	'TitleArray' => __DIR__ . '/includes/TitleArray.php',
-	'TitleArrayFromResult' => __DIR__ . '/includes/TitleArrayFromResult.php',
+	'TitleArray' => __DIR__ . '/includes/title/TitleArray.php',
+	'TitleArrayFromResult' => __DIR__ . '/includes/title/TitleArrayFromResult.php',
 	'TitleCleanup' => __DIR__ . '/maintenance/cleanupTitles.php',
-	'TitleFactory' => __DIR__ . '/includes/TitleFactory.php',
+	'TitleFactory' => __DIR__ . '/includes/title/TitleFactory.php',
 	'TitleFormatter' => __DIR__ . '/includes/title/TitleFormatter.php',
 	'TitleParser' => __DIR__ . '/includes/title/TitleParser.php',
 	'TitlePrefixSearch' => __DIR__ . '/includes/search/TitlePrefixSearch.php',

includes/Category.php

@@ -23,6 +23,7 @@
 
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;
+use MediaWiki\Title\TitleArray;
 use Wikimedia\Rdbms\ILoadBalancer;
 
 /**

includes/MediaWikiServices.php

@@ -133,6 +133,7 @@ use MediaWiki\Storage\PageEditStash;
 use MediaWiki\Storage\PageUpdaterFactory;
 use MediaWiki\Storage\RevertedTagUpdateManager;
 use MediaWiki\Tidy\TidyDriverBase;
+use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\ActorNormalization;
 use MediaWiki\User\ActorStore;
 use MediaWiki\User\ActorStoreFactory;
@@ -174,7 +175,6 @@ use SearchEngineFactory;
 use SiteLookup;
 use SiteStore;
 use SkinFactory;
-use TitleFactory;
 use TitleFormatter;
 use TitleParser;
 use TrackingCategories;

includes/MergeHistory.php

@@ -32,6 +32,7 @@ use MediaWiki\Permissions\PermissionStatus;
 use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RevisionStore;
 use MediaWiki\Revision\SlotRecord;
+use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\UserIdentity;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\ILoadBalancer;

includes/PageProps.php

@@ -22,6 +22,7 @@
 
 use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\Page\PageIdentity;
+use MediaWiki\Title\TitleArray;
 use Wikimedia\Rdbms\ILoadBalancer;
 
 /**

includes/ParamValidator/TypeDef/TitleDef.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\ParamValidator\TypeDef;
 
 use MediaWiki\Linker\LinkTarget;
-use TitleFactory;
+use MediaWiki\Title\TitleFactory;
 use Wikimedia\Message\MessageValue;
 use Wikimedia\ParamValidator\Callbacks;
 use Wikimedia\ParamValidator\ParamValidator;

includes/Revision/MainSlotRoleHandler.php

@@ -27,8 +27,8 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Page\PageIdentity;
+use MediaWiki\Title\TitleFactory;
 use MWUnknownContentModelException;
-use TitleFactory;
 
 /**
  * A SlotRoleHandler for the main slot. While most slot roles serve a specific purpose and

includes/Revision/RevisionStore.php

@@ -50,6 +50,7 @@ use MediaWiki\Storage\BlobStore;
 use MediaWiki\Storage\NameTableStore;
 use MediaWiki\Storage\RevisionSlotsUpdate;
 use MediaWiki\Storage\SqlBlobStore;
+use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\ActorStore;
 use MediaWiki\User\UserIdentity;
 use MWException;
@@ -63,7 +64,6 @@ use RuntimeException;
 use StatusValue;
 use stdClass;
 use Title;
-use TitleFactory;
 use Traversable;
 use WANObjectCache;
 use Wikimedia\Assert\Assert;

includes/Revision/RevisionStoreFactory.php

@@ -34,9 +34,9 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Page\PageStoreFactory;
 use MediaWiki\Storage\BlobStoreFactory;
 use MediaWiki\Storage\NameTableStoreFactory;
+use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\ActorStoreFactory;
 use Psr\Log\LoggerInterface;
-use TitleFactory;
 use WANObjectCache;
 use Wikimedia\Assert\Assert;
 use Wikimedia\Rdbms\ILBFactory;

includes/ServiceWiring.php

@@ -160,6 +160,7 @@ use MediaWiki\Storage\RevertedTagUpdateManager;
 use MediaWiki\Storage\SqlBlobStore;
 use MediaWiki\Tidy\RemexDriver;
 use MediaWiki\Tidy\TidyDriverBase;
+use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\ActorNormalization;
 use MediaWiki\User\ActorStore;
 use MediaWiki\User\ActorStoreFactory;

includes/actions/DeleteAction.php

@@ -26,6 +26,7 @@ use MediaWiki\Page\DeletePage;
 use MediaWiki\Page\DeletePageFactory;
 use MediaWiki\Permissions\PermissionStatus;
 use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\UserOptionsLookup;
 use MediaWiki\Watchlist\WatchlistManager;
 use Wikimedia\RequestTimeout\TimeoutException;

includes/api/ApiBlock.php

@@ -32,6 +32,7 @@ use MediaWiki\Block\Restriction\PageRestriction;
 use MediaWiki\MainConfigNames;
 use MediaWiki\ParamValidator\TypeDef\TitleDef;
 use MediaWiki\ParamValidator\TypeDef\UserDef;
+use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityLookup;
 use MediaWiki\User\UserOptionsLookup;

includes/api/ApiPageSet.php

@@ -30,6 +30,7 @@ use MediaWiki\Page\PageReference;
 use MediaWiki\Page\WikiPageFactory;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\SpecialPage\SpecialPageFactory;
+use MediaWiki\Title\TitleFactory;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IResultWrapper;

includes/api/ApiQueryInfo.php

@@ -27,6 +27,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\ParamValidator\TypeDef\TitleDef;
 use MediaWiki\Permissions\PermissionStatus;
 use MediaWiki\Permissions\RestrictionStore;
+use MediaWiki\Title\TitleFactory;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\ParamValidator\TypeDef\EnumDef;
 

includes/block/BlockUser.php

@@ -33,6 +33,7 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Permissions\Authority;
+use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\UserEditTracker;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;
@@ -41,7 +42,6 @@ use Psr\Log\LoggerInterface;
 use RevisionDeleteUser;
 use Status;
 use Title;
-use TitleFactory;
 use Wikimedia\Timestamp\ConvertibleTimestamp;
 
 /**

includes/block/UserBlockCommandFactory.php

@@ -24,11 +24,11 @@ namespace MediaWiki\Block;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Permissions\Authority;
+use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\UserEditTracker;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;
 use Psr\Log\LoggerInterface;
-use TitleFactory;
 
 class UserBlockCommandFactory implements BlockUserFactory, UnblockUserFactory {
 	/**

includes/cache/BacklinkCache.php

@@ -32,6 +32,8 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Page\PageReference;
+use MediaWiki\Title\TitleArray;
+use MediaWiki\Title\TitleArrayFromResult;
 use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IResultWrapper;

includes/cache/HtmlCacheUpdater.php

@@ -22,6 +22,7 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageReference;
+use MediaWiki\Title\TitleFactory;
 
 /**
  * Class to invalidate the CDN and HTMLFileCache entries associated with URLs/titles

includes/import/WikiImporter.php

@@ -35,6 +35,7 @@ use MediaWiki\Page\WikiPageFactory;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Revision\SlotRoleRegistry;
+use MediaWiki\Title\TitleFactory;
 use Wikimedia\NormalizedException\NormalizedException;
 
 /**

includes/import/WikiImporterFactory.php

@@ -24,6 +24,7 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Page\WikiPageFactory;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Revision\SlotRoleRegistry;
+use MediaWiki\Title\TitleFactory;
 
 /**
  * Factory service for WikiImporter instances.

includes/jobqueue/jobs/HTMLCacheUpdateJob.php

@@ -21,6 +21,7 @@
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageReference;
+use MediaWiki\Title\TitleArray;
 
 /**
  * Job to purge the HTML/file cache for all pages that link to or use another page or file

includes/page/ImagePage.php

@@ -20,6 +20,7 @@
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Title\TitleArray;
 use Wikimedia\Rdbms\IResultWrapper;
 
 /**

includes/page/PageCommandFactory.php

@@ -38,6 +38,7 @@ use MediaWiki\Permissions\RestrictionStore;
 use MediaWiki\Revision\ArchivedRevisionLookup;
 use MediaWiki\Revision\RevisionStore;
 use MediaWiki\Storage\PageUpdaterFactory;
+use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\ActorNormalization;
 use MediaWiki\User\UserEditTracker;
 use MediaWiki\User\UserFactory;
@@ -49,7 +50,6 @@ use Psr\Log\LoggerInterface;
 use ReadOnlyMode;
 use RepoGroup;
 use Title;
-use TitleFactory;
 use TitleFormatter;
 use WatchedItemStoreInterface;
 use Wikimedia\Message\ITextFormatter;

includes/page/WikiFilePage.php

@@ -20,6 +20,7 @@
 
 use MediaWiki\Actions\FileDeleteAction;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Title\TitleArray;
 use Wikimedia\Rdbms\FakeResultWrapper;
 
 /**

includes/page/WikiPage.php

@@ -43,6 +43,7 @@ use MediaWiki\Storage\PageUpdater;
 use MediaWiki\Storage\PageUpdaterFactory;
 use MediaWiki\Storage\PreparedUpdate;
 use MediaWiki\Storage\RevisionSlotsUpdate;
+use MediaWiki\Title\TitleArray;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;
 use Wikimedia\Assert\Assert;

includes/page/WikiPageFactory.php

@@ -5,9 +5,9 @@ namespace MediaWiki\Page;
 use DBAccessObjectUtils;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Page\Hook\WikiPageFactoryHook;
+use MediaWiki\Title\TitleFactory;
 use stdClass;
 use Title;
-use TitleFactory;
 use WikiCategoryPage;
 use WikiFilePage;
 use Wikimedia\Rdbms\ILoadBalancer;

includes/parser/ParserCache.php

@@ -27,6 +27,7 @@ use MediaWiki\Json\JsonCodec;
 use MediaWiki\Page\PageRecord;
 use MediaWiki\Page\WikiPageFactory;
 use MediaWiki\Parser\ParserCacheMetadata;
+use MediaWiki\Title\TitleFactory;
 use Psr\Log\LoggerInterface;
 
 /**

includes/parser/ParserCacheFactory.php

@@ -28,9 +28,9 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Json\JsonCodec;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\WikiPageFactory;
+use MediaWiki\Title\TitleFactory;
 use ParserCache;
 use Psr\Log\LoggerInterface;
-use TitleFactory;
 use WANObjectCache;
 
 /**

includes/parser/Parsoid/HtmlTransformFactory.php

@@ -6,7 +6,7 @@ use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Languages\LanguageFactory;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Parser\Parsoid\Config\PageConfigFactory;
-use TitleFactory;
+use MediaWiki\Title\TitleFactory;
 use Wikimedia\Parsoid\Config\SiteConfig;
 use Wikimedia\Parsoid\Parsoid;
 

includes/parser/Parsoid/LanguageVariantConverter.php

@@ -7,9 +7,9 @@ use MediaWiki\Page\PageIdentity;
 use MediaWiki\Parser\Parsoid\Config\PageConfigFactory;
 use MediaWiki\Rest\HttpException;
 use MediaWiki\Revision\RevisionAccessException;
+use MediaWiki\Title\TitleFactory;
 use ParserOutput;
 use Title;
-use TitleFactory;
 use Wikimedia\Parsoid\Config\PageConfig;
 use Wikimedia\Parsoid\Config\SiteConfig;
 use Wikimedia\Parsoid\Core\PageBundle;

includes/preferences/MultiTitleFilter.php

@@ -23,7 +23,7 @@ namespace MediaWiki\Preferences;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageStore;
 use MediaWiki\Page\ProperPageIdentity;
-use TitleFactory;
+use MediaWiki\Title\TitleFactory;
 use TitleFormatter;
 
 class MultiTitleFilter implements Filter {

includes/preferences/SignatureValidator.php

@@ -25,6 +25,7 @@ use MediaWiki\Config\ServiceOptions;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Parser\ParserOutputFlags;
 use MediaWiki\SpecialPage\SpecialPageFactory;
+use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\UserIdentity;
 use MessageLocalizer;
 use MultiHttpClient;
@@ -32,7 +33,6 @@ use ParserFactory;
 use ParserOptions;
 use ParsoidVirtualRESTService;
 use SpecialPage;
-use TitleFactory;
 use VirtualRESTServiceClient;
 
 /**

includes/preferences/SignatureValidatorFactory.php

@@ -23,10 +23,10 @@ namespace MediaWiki\Preferences;
 
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\SpecialPage\SpecialPageFactory;
+use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\UserIdentity;
 use MessageLocalizer;
 use ParserOptions;
-use TitleFactory;
 
 /**
  * @since 1.38

includes/search/PrefixSearch.php

@@ -21,6 +21,7 @@
  */
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Title\TitleArray;
 
 /**
  * Handles searching prefixes of titles and finding any page

includes/specialpage/SpecialPageFactory.php

@@ -33,11 +33,11 @@ use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageReference;
+use MediaWiki\Title\TitleFactory;
 use Profiler;
 use RequestContext;
 use SpecialPage;
 use Title;
-use TitleFactory;
 use User;
 use Wikimedia\DebugInfo\DebugInfoTrait;
 use Wikimedia\ObjectFactory\ObjectFactory;

includes/specials/SpecialMovepage.php

@@ -28,6 +28,7 @@ use MediaWiki\Page\MovePageFactory;
 use MediaWiki\Page\WikiPageFactory;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Permissions\RestrictionStore;
+use MediaWiki\Title\TitleArray;
 use MediaWiki\User\UserOptionsLookup;
 use MediaWiki\Watchlist\WatchlistManager;
 use Wikimedia\Rdbms\ILoadBalancer;

includes/specials/SpecialWhatLinksHere.php

@@ -25,6 +25,7 @@ use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Linker\LinksMigration;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Navigation\PagerNavigationBuilder;
+use MediaWiki\Title\TitleFactory;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\Rdbms\SelectQueryBuilder;

includes/title/NaiveImportTitleFactory.php

@@ -18,6 +18,8 @@
  * @file
  */
 
+use MediaWiki\Title\TitleFactory;
+
 /**
  * A class to convert page titles on a foreign wiki (ForeignTitle objects) into
  * page titles on the local wiki (Title objects), using a default namespace

includes/title/NamespaceImportTitleFactory.php

@@ -18,6 +18,8 @@
  * @file
  */
 
+use MediaWiki\Title\TitleFactory;
+
 /**
  * A class to convert page titles on a foreign wiki (ForeignTitle objects) into
  * page titles on the local wiki (Title objects), placing all pages in a fixed

includes/title/SubpageImportTitleFactory.php

@@ -18,6 +18,8 @@
  * @file
  */
 
+use MediaWiki\Title\TitleFactory;
+
 /**
  * A class to convert page titles on a foreign wiki (ForeignTitle objects) into
  * page titles on the local wiki (Title objects), placing all pages as subpages

includes/title/Title.php

@@ -36,6 +36,7 @@ use MediaWiki\Page\ProperPageIdentity;
 use MediaWiki\Request\PathRouter;
 use MediaWiki\ResourceLoader\WikiModule;
 use MediaWiki\StubObject\StubUserLang;
+use MediaWiki\Title\TitleArray;
 use Wikimedia\Assert\Assert;
 use Wikimedia\Assert\PreconditionException;
 use Wikimedia\Rdbms\IDatabase;

includes/title/TitleArray.php

@@ -24,6 +24,10 @@
  * @file
  */
 
+namespace MediaWiki\Title;
+
+use Iterator;
+use Title;
 use Wikimedia\Rdbms\IResultWrapper;
 
 /**
@@ -57,3 +61,5 @@ abstract class TitleArray implements Iterator {
 	 */
 	abstract public function key(): int;
 }
+
+class_alias( TitleArray::class, 'TitleArray' );

includes/title/TitleArrayFromResult.php

@@ -24,6 +24,10 @@
  * @file
  */
 
+namespace MediaWiki\Title;
+
+use Countable;
+use Title;
 use Wikimedia\Rdbms\IResultWrapper;
 
 /**
@@ -53,7 +57,7 @@ class TitleArrayFromResult extends TitleArray implements Countable {
 	}
 
 	/**
-	 * @param stdClass|false $row
+	 * @param \stdClass|false $row
 	 * @return void
 	 */
 	protected function setCurrent( $row ) {
@@ -98,3 +102,5 @@ class TitleArrayFromResult extends TitleArray implements Countable {
 		return $this->current !== false;
 	}
 }
+
+class_alias( TitleArrayFromResult::class, 'TitleArrayFromResult' );

includes/title/TitleFactory.php

@@ -20,9 +20,14 @@
  * @file
  */
 
+namespace MediaWiki\Title;
+
+use MalformedTitleException;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageReference;
+use MessageLocalizer;
+use Title;
 
 /**
  * Creates Title objects.
@@ -86,8 +91,8 @@ class TitleFactory {
 	 * @see Title::newFromText
 	 * @param string|int|null $text
 	 * @param int $defaultNamespace
-	 * @throws InvalidArgumentException
 	 * @return Title|null
+	 * @throws \InvalidArgumentException
 	 */
 	public function newFromText( $text, $defaultNamespace = NS_MAIN ): ?Title {
 		return Title::newFromText( $text, $defaultNamespace );
@@ -97,8 +102,8 @@ class TitleFactory {
 	 * @see Title::newFromTextThrow
 	 * @param string $text
 	 * @param int $defaultNamespace
-	 * @throws MalformedTitleException
 	 * @return Title
+	 * @throws MalformedTitleException
 	 */
 	public function newFromTextThrow( $text, $defaultNamespace = NS_MAIN ): Title {
 		return Title::newFromTextThrow( $text, $defaultNamespace );
@@ -124,10 +129,10 @@ class TitleFactory {
 	}
 
 	/**
+	 * @deprecated since 1.38 use a PageStore QueryBuilder instead
 	 * @see Title::newFromIDs
 	 * @param int[] $ids
 	 * @return Title[]
-	 * @deprecated since 1.38 use a PageStore QueryBuilder instead
 	 */
 	public function newFromIDs( $ids ): array {
 		wfDeprecated( __METHOD__, '1.38' );
@@ -136,7 +141,7 @@ class TitleFactory {
 
 	/**
 	 * @see Title::newFromRow
-	 * @param stdClass $row
+	 * @param \stdClass $row
 	 * @return Title
 	 */
 	public function newFromRow( $row ): Title {
@@ -177,3 +182,5 @@ class TitleFactory {
 	}
 
 }
+
+class_alias( TitleFactory::class, 'TitleFactory' );

tests/phpunit/includes/PagePropsTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Title\TitleArray;
 use Wikimedia\Rdbms\FakeResultWrapper;
 
 /**

tests/phpunit/includes/Revision/RevisionRendererTest.php

@@ -18,12 +18,12 @@ use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Revision\SlotRoleRegistry;
 use MediaWiki\Storage\NameTableStore;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
+use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\UserIdentityValue;
 use MediaWikiIntegrationTestCase;
 use ParserOptions;
 use ParserOutput;
 use PHPUnit\Framework\MockObject\MockObject;
-use TitleFactory;
 use Wikimedia\Rdbms\DBConnRef;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\ILoadBalancer;

tests/phpunit/includes/Revision/RevisionStoreDbTest.php

@@ -26,6 +26,7 @@ use MediaWiki\Revision\RevisionStoreRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Storage\BlobStore;
 use MediaWiki\Storage\SqlBlobStore;
+use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\UserIdentityValue;
 use MediaWikiIntegrationTestCase;
 use MWTimestamp;
@@ -35,7 +36,6 @@ use StatusValue;
 use TestUserRegistry;
 use TextContent;
 use Title;
-use TitleFactory;
 use User;
 use WANObjectCache;
 use Wikimedia\Assert\PreconditionException;

tests/phpunit/integration/includes/cache/HtmlCacheUpdaterIntegrationTest.php

@@ -4,6 +4,7 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\StaticHookRegistry;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageReferenceValue;
+use MediaWiki\Title\TitleArrayFromResult;
 use Wikimedia\Rdbms\FakeResultWrapper;
 
 /**

tests/phpunit/unit/includes/Revision/MainSlotRoleHandlerTest.php

@@ -5,10 +5,10 @@ namespace MediaWiki\Tests\Unit\Revision;
 use ContentHandler;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Revision\MainSlotRoleHandler;
+use MediaWiki\Title\TitleFactory;
 use MediaWikiUnitTestCase;
 use MockTitleTrait;
 use Title;
-use TitleFactory;
 
 /**
  * @covers \MediaWiki\Revision\MainSlotRoleHandler

tests/phpunit/unit/includes/Revision/RevisionStoreFactoryTest.php

@@ -16,6 +16,7 @@ use MediaWiki\Storage\BlobStoreFactory;
 use MediaWiki\Storage\NameTableStore;
 use MediaWiki\Storage\NameTableStoreFactory;
 use MediaWiki\Storage\SqlBlobStore;
+use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\ActorStore;
 use MediaWiki\User\ActorStoreFactory;
 use MediaWiki\User\UserIdentityLookup;
@@ -23,7 +24,6 @@ use MediaWikiUnitTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
-use TitleFactory;
 use WANObjectCache;
 use Wikimedia\Rdbms\ILBFactory;
 use Wikimedia\Rdbms\ILoadBalancer;

tests/phpunit/unit/includes/Revision/SlotRoleRegistryTest.php

@@ -10,9 +10,9 @@ use MediaWiki\Revision\MainSlotRoleHandler;
 use MediaWiki\Revision\SlotRoleHandler;
 use MediaWiki\Revision\SlotRoleRegistry;
 use MediaWiki\Storage\NameTableStore;
+use MediaWiki\Title\TitleFactory;
 use MediaWikiUnitTestCase;
 use Title;
-use TitleFactory;
 use Wikimedia\Assert\PostconditionException;
 
 /**

tests/phpunit/unit/includes/TitleArrayFromResultTest.php

@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Title\TitleArrayFromResult;
+
 /**
  * @author Addshore
  * @covers TitleArrayFromResult

tests/phpunit/unit/includes/cache/HtmlCacheUpdaterTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Title\TitleFactory;
 use PHPUnit\Framework\MockObject\MockObject;
 
 /**

tests/phpunit/unit/includes/parser/ParserCacheFactoryTest.php

@@ -6,6 +6,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\Page\WikiPageFactory;
 use MediaWiki\Parser\ParserCacheFactory;
 use MediaWiki\Parser\RevisionOutputCache;
+use MediaWiki\Title\TitleFactory;
 use Psr\Log\NullLogger;
 
 /**

tests/phpunit/unit/includes/preferences/MultiTitleFilterTest.php

@@ -22,6 +22,7 @@ use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Page\PageSelectQueryBuilder;
 use MediaWiki\Page\PageStore;
 use MediaWiki\Preferences\MultiTitleFilter;
+use MediaWiki\Title\TitleFactory;
 
 /**
  * @group Preferences

tests/phpunit/unit/parser/Parsoid/LanguageVariantConverterUnitTest.php

@@ -9,10 +9,10 @@ use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Parser\Parsoid\Config\PageConfig;
 use MediaWiki\Parser\Parsoid\Config\PageConfigFactory;
 use MediaWiki\Parser\Parsoid\Config\SiteConfig;
+use MediaWiki\Title\TitleFactory;
 use MediaWikiUnitTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Title;
-use TitleFactory;
 use Wikimedia\Parsoid\Core\PageBundle;
 use Wikimedia\Parsoid\Parsoid;