diff --git a/autoload.php b/autoload.php index d3793ed0cb5..ae10665e92f 100644 --- a/autoload.php +++ b/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', diff --git a/includes/Category.php b/includes/Category.php index b77969ab6d0..1b68176c19e 100644 --- a/includes/Category.php +++ b/includes/Category.php @@ -23,6 +23,7 @@ use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageIdentity; +use MediaWiki\Title\TitleArray; use Wikimedia\Rdbms\ILoadBalancer; /** diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php index 462924a4e8a..e1c67f98024 100644 --- a/includes/MediaWikiServices.php +++ b/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; diff --git a/includes/MergeHistory.php b/includes/MergeHistory.php index 9bb8f67e1d7..4d606cc82d1 100644 --- a/includes/MergeHistory.php +++ b/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; diff --git a/includes/PageProps.php b/includes/PageProps.php index 684a42402ab..485adc99b37 100644 --- a/includes/PageProps.php +++ b/includes/PageProps.php @@ -22,6 +22,7 @@ use MediaWiki\Cache\LinkBatchFactory; use MediaWiki\Page\PageIdentity; +use MediaWiki\Title\TitleArray; use Wikimedia\Rdbms\ILoadBalancer; /** diff --git a/includes/ParamValidator/TypeDef/TitleDef.php b/includes/ParamValidator/TypeDef/TitleDef.php index 5b8c3566b74..dde252ffc1c 100644 --- a/includes/ParamValidator/TypeDef/TitleDef.php +++ b/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; diff --git a/includes/Revision/MainSlotRoleHandler.php b/includes/Revision/MainSlotRoleHandler.php index 140caae95d8..c37d5eca7e4 100644 --- a/includes/Revision/MainSlotRoleHandler.php +++ b/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 diff --git a/includes/Revision/RevisionStore.php b/includes/Revision/RevisionStore.php index b9626281a4a..910c6f9df6e 100644 --- a/includes/Revision/RevisionStore.php +++ b/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; diff --git a/includes/Revision/RevisionStoreFactory.php b/includes/Revision/RevisionStoreFactory.php index 10189b43359..122f0a2d2b5 100644 --- a/includes/Revision/RevisionStoreFactory.php +++ b/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; diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php index 78b5a567fcf..e83d490d9c0 100644 --- a/includes/ServiceWiring.php +++ b/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; diff --git a/includes/actions/DeleteAction.php b/includes/actions/DeleteAction.php index 6a5d6e9c20d..4319365c7e1 100644 --- a/includes/actions/DeleteAction.php +++ b/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; diff --git a/includes/api/ApiBlock.php b/includes/api/ApiBlock.php index 06a492ef969..b6ca8864143 100644 --- a/includes/api/ApiBlock.php +++ b/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; diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php index 9df4b4b08c0..84f3fb0a03d 100644 --- a/includes/api/ApiPageSet.php +++ b/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; diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php index 068cd24317c..eb278314991 100644 --- a/includes/api/ApiQueryInfo.php +++ b/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; diff --git a/includes/block/BlockUser.php b/includes/block/BlockUser.php index 2e38b87527b..1044d4419fa 100644 --- a/includes/block/BlockUser.php +++ b/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; /** diff --git a/includes/block/UserBlockCommandFactory.php b/includes/block/UserBlockCommandFactory.php index 69a98d3b7da..54ef6b1e98a 100644 --- a/includes/block/UserBlockCommandFactory.php +++ b/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 { /** diff --git a/includes/cache/BacklinkCache.php b/includes/cache/BacklinkCache.php index 020dd43ac1a..1898949e031 100644 --- a/includes/cache/BacklinkCache.php +++ b/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; diff --git a/includes/cache/HtmlCacheUpdater.php b/includes/cache/HtmlCacheUpdater.php index b5965a5d62e..8427fc1ca1b 100644 --- a/includes/cache/HtmlCacheUpdater.php +++ b/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 diff --git a/includes/import/WikiImporter.php b/includes/import/WikiImporter.php index 8af9cace16d..efaf1dce627 100644 --- a/includes/import/WikiImporter.php +++ b/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; /** diff --git a/includes/import/WikiImporterFactory.php b/includes/import/WikiImporterFactory.php index d529a64881b..403443888e4 100644 --- a/includes/import/WikiImporterFactory.php +++ b/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. diff --git a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php index f0a02bee5d0..548b73904e3 100644 --- a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php +++ b/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 diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php index 9affa37f466..0904d737d54 100644 --- a/includes/page/ImagePage.php +++ b/includes/page/ImagePage.php @@ -20,6 +20,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Title\TitleArray; use Wikimedia\Rdbms\IResultWrapper; /** diff --git a/includes/page/PageCommandFactory.php b/includes/page/PageCommandFactory.php index d8ee81f4628..38d03af2323 100644 --- a/includes/page/PageCommandFactory.php +++ b/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; diff --git a/includes/page/WikiFilePage.php b/includes/page/WikiFilePage.php index d669d5313c5..dc033155639 100644 --- a/includes/page/WikiFilePage.php +++ b/includes/page/WikiFilePage.php @@ -20,6 +20,7 @@ use MediaWiki\Actions\FileDeleteAction; use MediaWiki\MediaWikiServices; +use MediaWiki\Title\TitleArray; use Wikimedia\Rdbms\FakeResultWrapper; /** diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 1b91a339283..8a9a7eb6d73 100644 --- a/includes/page/WikiPage.php +++ b/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; diff --git a/includes/page/WikiPageFactory.php b/includes/page/WikiPageFactory.php index c244daef0b8..26417bd3955 100644 --- a/includes/page/WikiPageFactory.php +++ b/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; diff --git a/includes/parser/ParserCache.php b/includes/parser/ParserCache.php index 7629d330b10..ce2504d68df 100644 --- a/includes/parser/ParserCache.php +++ b/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; /** diff --git a/includes/parser/ParserCacheFactory.php b/includes/parser/ParserCacheFactory.php index 5b9ea2e8e5d..3f79d8d0609 100644 --- a/includes/parser/ParserCacheFactory.php +++ b/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; /** diff --git a/includes/parser/Parsoid/HtmlTransformFactory.php b/includes/parser/Parsoid/HtmlTransformFactory.php index 2690a71dad8..f5af4579830 100644 --- a/includes/parser/Parsoid/HtmlTransformFactory.php +++ b/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; diff --git a/includes/parser/Parsoid/LanguageVariantConverter.php b/includes/parser/Parsoid/LanguageVariantConverter.php index 5e9e9b9bfaf..2afc6ac98e9 100644 --- a/includes/parser/Parsoid/LanguageVariantConverter.php +++ b/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; diff --git a/includes/preferences/MultiTitleFilter.php b/includes/preferences/MultiTitleFilter.php index 2f98a314a9a..ba05fd6bf21 100644 --- a/includes/preferences/MultiTitleFilter.php +++ b/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 { diff --git a/includes/preferences/SignatureValidator.php b/includes/preferences/SignatureValidator.php index 17d86de5ed1..cea63ad3448 100644 --- a/includes/preferences/SignatureValidator.php +++ b/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; /** diff --git a/includes/preferences/SignatureValidatorFactory.php b/includes/preferences/SignatureValidatorFactory.php index 8cd18f16488..815ff899a0f 100644 --- a/includes/preferences/SignatureValidatorFactory.php +++ b/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 diff --git a/includes/search/PrefixSearch.php b/includes/search/PrefixSearch.php index 16e7bd1a675..a009f246a09 100644 --- a/includes/search/PrefixSearch.php +++ b/includes/search/PrefixSearch.php @@ -21,6 +21,7 @@ */ use MediaWiki\MediaWikiServices; +use MediaWiki\Title\TitleArray; /** * Handles searching prefixes of titles and finding any page diff --git a/includes/specialpage/SpecialPageFactory.php b/includes/specialpage/SpecialPageFactory.php index 45a552fbfdc..b19432fdfe9 100644 --- a/includes/specialpage/SpecialPageFactory.php +++ b/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; diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php index 26c2860238f..7813b35181a 100644 --- a/includes/specials/SpecialMovepage.php +++ b/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; diff --git a/includes/specials/SpecialWhatLinksHere.php b/includes/specials/SpecialWhatLinksHere.php index 6a976ffecc0..e5bb2e59af6 100644 --- a/includes/specials/SpecialWhatLinksHere.php +++ b/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; diff --git a/includes/title/NaiveImportTitleFactory.php b/includes/title/NaiveImportTitleFactory.php index 443fefafdc0..070ea7d0dd3 100644 --- a/includes/title/NaiveImportTitleFactory.php +++ b/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 diff --git a/includes/title/NamespaceImportTitleFactory.php b/includes/title/NamespaceImportTitleFactory.php index c9c1f1ac08e..51072f6f7e0 100644 --- a/includes/title/NamespaceImportTitleFactory.php +++ b/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 diff --git a/includes/title/SubpageImportTitleFactory.php b/includes/title/SubpageImportTitleFactory.php index 63744657408..57b8ac152c9 100644 --- a/includes/title/SubpageImportTitleFactory.php +++ b/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 diff --git a/includes/title/Title.php b/includes/title/Title.php index 4169e9084a6..1512b912f85 100644 --- a/includes/title/Title.php +++ b/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; diff --git a/includes/TitleArray.php b/includes/title/TitleArray.php similarity index 95% rename from includes/TitleArray.php rename to includes/title/TitleArray.php index 652b9375b9f..510fb8956bf 100644 --- a/includes/TitleArray.php +++ b/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' ); diff --git a/includes/TitleArrayFromResult.php b/includes/title/TitleArrayFromResult.php similarity index 93% rename from includes/TitleArrayFromResult.php rename to includes/title/TitleArrayFromResult.php index 42aff05bc4d..5d134ac7ad0 100644 --- a/includes/TitleArrayFromResult.php +++ b/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' ); diff --git a/includes/TitleFactory.php b/includes/title/TitleFactory.php similarity index 95% rename from includes/TitleFactory.php rename to includes/title/TitleFactory.php index 29dae28c400..62903444e0a 100644 --- a/includes/TitleFactory.php +++ b/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' ); diff --git a/tests/phpunit/includes/PagePropsTest.php b/tests/phpunit/includes/PagePropsTest.php index 1d1c41746a6..9b01e7074b6 100644 --- a/tests/phpunit/includes/PagePropsTest.php +++ b/tests/phpunit/includes/PagePropsTest.php @@ -1,5 +1,6 @@