Reorg: Move five page-related classes to page/ out of includes/

These classes:
 - MergeHistory
 - MovePage
 - ProtectionForm
 - BadFileLookup (to MediaWiki\Page\File)
 - FileDeleteForm (to MediaWiki\Page\File)

Bug: T321882
Change-Id: Ibeb488ba322c62a34042a0307bbb5562773bcad1

autoload.php

@@ -496,7 +496,7 @@ $wgAutoloadLocalClasses = [
 	'FileCacheBase' => __DIR__ . '/includes/cache/FileCacheBase.php',
 	'FileContentHandler' => __DIR__ . '/includes/content/FileContentHandler.php',
 	'FileContentsHasher' => __DIR__ . '/includes/utils/FileContentsHasher.php',
-	'FileDeleteForm' => __DIR__ . '/includes/FileDeleteForm.php',
+	'FileDeleteForm' => __DIR__ . '/includes/page/File/FileDeleteForm.php',
 	'FileDependency' => __DIR__ . '/includes/language/dependency/FileDependency.php',
 	'FileOp' => __DIR__ . '/includes/libs/filebackend/fileop/FileOp.php',
 	'FileOpBatch' => __DIR__ . '/includes/libs/filebackend/FileOpBatch.php',
@@ -918,7 +918,7 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Auth\\Throttler' => __DIR__ . '/includes/auth/Throttler.php',
 	'MediaWiki\\Auth\\UserDataAuthenticationRequest' => __DIR__ . '/includes/auth/UserDataAuthenticationRequest.php',
 	'MediaWiki\\Auth\\UsernameAuthenticationRequest' => __DIR__ . '/includes/auth/UsernameAuthenticationRequest.php',
-	'MediaWiki\\BadFileLookup' => __DIR__ . '/includes/BadFileLookup.php',
+	'MediaWiki\\BadFileLookup' => __DIR__ . '/includes/page/File/BadFileLookup.php',
 	'MediaWiki\\Block\\AbstractBlock' => __DIR__ . '/includes/block/AbstractBlock.php',
 	'MediaWiki\\Block\\Block' => __DIR__ . '/includes/block/Block.php',
 	'MediaWiki\\Block\\BlockActionInfo' => __DIR__ . '/includes/block/BlockActionInfo.php',
@@ -1511,6 +1511,7 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Page\\DeletePage' => __DIR__ . '/includes/page/DeletePage.php',
 	'MediaWiki\\Page\\DeletePageFactory' => __DIR__ . '/includes/page/DeletePageFactory.php',
 	'MediaWiki\\Page\\ExistingPageRecord' => __DIR__ . '/includes/page/ExistingPageRecord.php',
+	'MediaWiki\\Page\\File\\BadFileLookup' => __DIR__ . '/includes/page/File/BadFileLookup.php',
 	'MediaWiki\\Page\\Hook\\ArticleConfirmDeleteHook' => __DIR__ . '/includes/page/Hook/ArticleConfirmDeleteHook.php',
 	'MediaWiki\\Page\\Hook\\ArticleDeleteAfterSuccessHook' => __DIR__ . '/includes/page/Hook/ArticleDeleteAfterSuccessHook.php',
 	'MediaWiki\\Page\\Hook\\ArticleDeleteCompleteHook' => __DIR__ . '/includes/page/Hook/ArticleDeleteCompleteHook.php',
@@ -1553,7 +1554,9 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Page\\Hook\\WikiPageDeletionUpdatesHook' => __DIR__ . '/includes/page/Hook/WikiPageDeletionUpdatesHook.php',
 	'MediaWiki\\Page\\Hook\\WikiPageFactoryHook' => __DIR__ . '/includes/page/Hook/WikiPageFactoryHook.php',
 	'MediaWiki\\Page\\LegacyArticleIdAccess' => __DIR__ . '/includes/page/LegacyArticleIdAccess.php',
+	'MediaWiki\\Page\\MergeHistory' => __DIR__ . '/includes/page/MergeHistory.php',
 	'MediaWiki\\Page\\MergeHistoryFactory' => __DIR__ . '/includes/page/MergeHistoryFactory.php',
+	'MediaWiki\\Page\\MovePage' => __DIR__ . '/includes/page/MovePage.php',
 	'MediaWiki\\Page\\MovePageFactory' => __DIR__ . '/includes/page/MovePageFactory.php',
 	'MediaWiki\\Page\\PageAssertionException' => __DIR__ . '/includes/page/PageAssertionException.php',
 	'MediaWiki\\Page\\PageCommandFactory' => __DIR__ . '/includes/page/PageCommandFactory.php',
@@ -1570,6 +1573,7 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Page\\PageStoreRecord' => __DIR__ . '/includes/page/PageStoreRecord.php',
 	'MediaWiki\\Page\\ParserOutputAccess' => __DIR__ . '/includes/page/ParserOutputAccess.php',
 	'MediaWiki\\Page\\ProperPageIdentity' => __DIR__ . '/includes/page/ProperPageIdentity.php',
+	'MediaWiki\\Page\\ProtectionForm' => __DIR__ . '/includes/page/ProtectionForm.php',
 	'MediaWiki\\Page\\RedirectLookup' => __DIR__ . '/includes/page/RedirectLookup.php',
 	'MediaWiki\\Page\\RedirectStore' => __DIR__ . '/includes/page/RedirectStore.php',
 	'MediaWiki\\Page\\RollbackPage' => __DIR__ . '/includes/page/RollbackPage.php',
@@ -2049,6 +2053,7 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Widget\\TitlesMultiselectWidget' => __DIR__ . '/includes/widget/TitlesMultiselectWidget.php',
 	'MediaWiki\\Widget\\UserInputWidget' => __DIR__ . '/includes/widget/UserInputWidget.php',
 	'MediaWiki\\Widget\\UsersMultiselectWidget' => __DIR__ . '/includes/widget/UsersMultiselectWidget.php',
+	'Mediawiki\\Page\\File\\FileDeleteForm' => __DIR__ . '/includes/page/File/FileDeleteForm.php',
 	'MediumSpecificBagOStuff' => __DIR__ . '/includes/libs/objectcache/MediumSpecificBagOStuff.php',
 	'MemcLockManager' => __DIR__ . '/includes/libs/lockmanager/MemcLockManager.php',
 	'MemcachedBagOStuff' => __DIR__ . '/includes/libs/objectcache/MemcachedBagOStuff.php',
@@ -2057,7 +2062,7 @@ $wgAutoloadLocalClasses = [
 	'MemcachedPhpBagOStuff' => __DIR__ . '/includes/libs/objectcache/MemcachedPhpBagOStuff.php',
 	'MemoizedCallable' => __DIR__ . '/includes/libs/MemoizedCallable.php',
 	'MemoryFileBackend' => __DIR__ . '/includes/libs/filebackend/MemoryFileBackend.php',
-	'MergeHistory' => __DIR__ . '/includes/MergeHistory.php',
+	'MergeHistory' => __DIR__ . '/includes/page/MergeHistory.php',
 	'MergeHistoryPager' => __DIR__ . '/includes/specials/pagers/MergeHistoryPager.php',
 	'MergeLogFormatter' => __DIR__ . '/includes/logging/MergeLogFormatter.php',
 	'MergeableUpdate' => __DIR__ . '/includes/deferred/MergeableUpdate.php',
@@ -2080,7 +2085,7 @@ $wgAutoloadLocalClasses = [
 	'MoveBatch' => __DIR__ . '/maintenance/moveBatch.php',
 	'MoveFileOp' => __DIR__ . '/includes/libs/filebackend/fileop/MoveFileOp.php',
 	'MoveLogFormatter' => __DIR__ . '/includes/logging/MoveLogFormatter.php',
-	'MovePage' => __DIR__ . '/includes/MovePage.php',
+	'MovePage' => __DIR__ . '/includes/page/MovePage.php',
 	'MovePageForm' => __DIR__ . '/includes/specials/SpecialMovepage.php',
 	'MoveToExternal' => __DIR__ . '/maintenance/storage/moveToExternal.php',
 	'MultiConfig' => __DIR__ . '/includes/config/MultiConfig.php',
@@ -2212,7 +2217,7 @@ $wgAutoloadLocalClasses = [
 	'ProtectLogFormatter' => __DIR__ . '/includes/logging/ProtectLogFormatter.php',
 	'ProtectedPagesPager' => __DIR__ . '/includes/specials/pagers/ProtectedPagesPager.php',
 	'ProtectedTitlesPager' => __DIR__ . '/includes/specials/pagers/ProtectedTitlesPager.php',
-	'ProtectionForm' => __DIR__ . '/includes/ProtectionForm.php',
+	'ProtectionForm' => __DIR__ . '/includes/page/ProtectionForm.php',
 	'ProxyLookup' => __DIR__ . '/includes/ProxyLookup.php',
 	'PruneFileCache' => __DIR__ . '/maintenance/pruneFileCache.php',
 	'PruneUnusedLinkTargetRows' => __DIR__ . '/maintenance/pruneUnusedLinkTargetRows.php',

includes/MediaWikiServices.php

@@ -91,6 +91,7 @@ use MediaWiki\Linker\LinkTargetLookup;
 use MediaWiki\Mail\IEmailer;
 use MediaWiki\Page\ContentModelChangeFactory;
 use MediaWiki\Page\DeletePageFactory;
+use MediaWiki\Page\File\BadFileLookup;
 use MediaWiki\Page\MergeHistoryFactory;
 use MediaWiki\Page\MovePageFactory;
 use MediaWiki\Page\PageProps;

includes/ServiceWiring.php

@@ -45,7 +45,6 @@ use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
 use MediaWiki\Actions\ActionFactory;
 use MediaWiki\Auth\AuthManager;
 use MediaWiki\Auth\Throttler;
-use MediaWiki\BadFileLookup;
 use MediaWiki\Block\BlockActionInfo;
 use MediaWiki\Block\BlockErrorFormatter;
 use MediaWiki\Block\BlockManager;
@@ -108,6 +107,7 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Message\MessageFormatterFactory;
 use MediaWiki\Page\ContentModelChangeFactory;
 use MediaWiki\Page\DeletePageFactory;
+use MediaWiki\Page\File\BadFileLookup;
 use MediaWiki\Page\MergeHistoryFactory;
 use MediaWiki\Page\MovePageFactory;
 use MediaWiki\Page\PageCommandFactory;

includes/actions/FileDeleteAction.php

@@ -24,11 +24,11 @@ use Article;
 use DeleteAction;
 use ErrorPageError;
 use File;
-use FileDeleteForm;
 use IContextSource;
 use LocalFile;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use Mediawiki\Page\File\FileDeleteForm;
 use MediaWiki\Permissions\PermissionStatus;
 use OldLocalFile;
 use PermissionsError;

includes/api/ApiDelete.php

@@ -23,6 +23,7 @@
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\DeletePage;
 use MediaWiki\Page\DeletePageFactory;
+use Mediawiki\Page\File\FileDeleteForm;
 use MediaWiki\User\UserOptionsLookup;
 use MediaWiki\Watchlist\WatchlistManager;
 use Wikimedia\ParamValidator\ParamValidator;

includes/api/ApiQueryImageInfo.php

@@ -20,10 +20,10 @@
  * @file
  */
 
-use MediaWiki\BadFileLookup;
 use MediaWiki\Linker\Linker;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Page\File\BadFileLookup;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\ParamValidator\TypeDef\IntegerDef;
 

includes/api/ApiQueryStashImageInfo.php

@@ -20,7 +20,7 @@
  * @file
  */
 
-use MediaWiki\BadFileLookup;
+use MediaWiki\Page\File\BadFileLookup;
 use Wikimedia\ParamValidator\ParamValidator;
 
 /**

includes/page/Article.php

@@ -28,6 +28,7 @@ use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\ParserOutputAccess;
+use MediaWiki\Page\ProtectionForm;
 use MediaWiki\Page\WikiPageFactory;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Permissions\PermissionStatus;

includes/page/File/BadFileLookup.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace MediaWiki;
+namespace MediaWiki\Page\File;
 
 use BagOStuff;
 use MalformedTitleException;
@@ -139,3 +139,5 @@ class BadFileLookup {
 		return $ret;
 	}
 }
+
+class_alias( BadFileLookup::class, 'MediaWiki\\BadFileLookup' );

includes/page/File/FileDeleteForm.php

@@ -22,9 +22,17 @@
  * @ingroup Media
  */
 
+namespace Mediawiki\Page\File;
+
+use Hooks;
+use LocalFile;
+use ManualLogEntry;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\DeletePage;
 use MediaWiki\User\UserIdentity;
+use MWException;
+use Status;
+use Title;
 
 /**
  * File deletion user interface
@@ -47,8 +55,15 @@ class FileDeleteForm {
 	 *   scheduled deletion.
 	 * @throws MWException
 	 */
-	public static function doDelete( Title $title, LocalFile $file, ?string $oldimage, $reason,
-		$suppress, UserIdentity $user, $tags = [], bool $deleteTalk = false
+	public static function doDelete(
+		Title $title,
+		LocalFile $file,
+		?string $oldimage,
+		$reason,
+		$suppress,
+		UserIdentity $user,
+		$tags = [],
+		bool $deleteTalk = false
 	): Status {
 		if ( $oldimage ) {
 			$page = null;
@@ -79,7 +94,7 @@ class FileDeleteForm {
 			);
 			$services = MediaWikiServices::getInstance();
 			$page = $services->getWikiPageFactory()->newFromTitle( $title );
-			'@phan-var WikiFilePage $page';
+			'@phan-var \WikiFilePage $page';
 			$deleter = $services->getUserFactory()->newFromUserIdentity( $user );
 			$deletePage = $services->getDeletePageFactory()->newDeletePage( $page, $deleter );
 			if ( $deleteTalk ) {
@@ -158,3 +173,5 @@ class FileDeleteForm {
 			&& strpos( $oldimage, '\\' ) === false;
 	}
 }
+
+class_alias( FileDeleteForm::class, 'FileDeleteForm' );

includes/page/MergeHistory.php

@@ -21,13 +21,17 @@
  * @file
  */
 
+namespace MediaWiki\Page;
+
+use Content;
+use InvalidArgumentException;
+use ManualLogEntry;
+use MediaWiki;
 use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\EditPage\SpamChecker;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
-use MediaWiki\Page\PageIdentity;
-use MediaWiki\Page\WikiPageFactory;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Permissions\PermissionStatus;
 use MediaWiki\Revision\MutableRevisionRecord;
@@ -35,6 +39,11 @@ use MediaWiki\Revision\RevisionStore;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\UserIdentity;
+use Message;
+use MWTimestamp;
+use Status;
+use TitleFormatter;
+use WatchedItemStoreInterface;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\Timestamp\TimestampException;
@@ -158,7 +167,9 @@ class MergeHistory {
 	 * @return int
 	 */
 	public function getRevisionCount() {
-		$count = $this->dbw->selectRowCount( 'revision', '1',
+		$count = $this->dbw->selectRowCount(
+			'revision',
+			'1',
 			[ 'rev_page' => $this->source->getId(), $this->getTimeWhere() ],
 			__METHOD__,
 			[ 'LIMIT' => self::REVISION_LIMIT + 1 ]
@@ -595,3 +606,5 @@ class MergeHistory {
 		}
 	}
 }
+
+class_alias( MergeHistory::class, 'MergeHistory' );

includes/page/MergeHistoryFactory.php

@@ -21,8 +21,6 @@
 
 namespace MediaWiki\Page;
 
-use MergeHistory;
-
 /**
  * Service for mergehistory actions.
  *

includes/page/MovePage.php

@@ -18,6 +18,15 @@
  * @file
  */
 
+namespace MediaWiki\Page;
+
+use AtomicSectionUpdate;
+use ChangeTags;
+use ContentHandler;
+use DeferredUpdates;
+use File;
+use LogFormatter;
+use ManualLogEntry;
 use MediaWiki\Collation\CollationFactory;
 use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Config\ServiceOptions;
@@ -26,21 +35,27 @@ use MediaWiki\EditPage\SpamChecker;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\MainConfigNames;
-use MediaWiki\Page\MovePageFactory;
-use MediaWiki\Page\PageIdentity;
-use MediaWiki\Page\WikiPageFactory;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Permissions\PermissionStatus;
 use MediaWiki\Permissions\RestrictionStore;
-use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\RevisionStore;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Storage\PageUpdaterFactory;
 use MediaWiki\User\UserEditTracker;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;
+use MWException;
+use NamespaceInfo;
+use RepoGroup;
+use RequestContext;
+use Status;
+use StringUtils;
+use Title;
+use WatchedItemStoreInterface;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\ILoadBalancer;
+use WikiPage;
+use WikitextContent;
 
 /**
  * Handles the backend logic of moving a page from one title
@@ -680,7 +695,7 @@ class MovePage {
 			return $moveAttemptResult;
 		} else {
 			$nullRevision = $moveAttemptResult->getValue()['nullRevision'];
-			'@phan-var RevisionRecord $nullRevision';
+			'@phan-var \MediaWiki\Revision\RevisionRecord $nullRevision';
 		}
 
 		$redirid = $this->oldTitle->getArticleID();
@@ -828,7 +843,11 @@ class MovePage {
 	 *     'redirectRevision' => The initial revision of the redirect if it was created (RevisionRecord|null)
 	 *   ]
 	 */
-	private function moveToInternal( UserIdentity $user, &$nt, $reason = '', $createRedirect = true,
+	private function moveToInternal(
+		UserIdentity $user,
+		&$nt,
+		$reason = '',
+		$createRedirect = true,
 		array $changeTags = []
 	): Status {
 		if ( $nt->getArticleID( Title::READ_LATEST ) ) {
@@ -1010,3 +1029,5 @@ class MovePage {
 		] );
 	}
 }
+
+class_alias( MovePage::class, 'MovePage' );

includes/page/MovePageFactory.php

@@ -20,7 +20,6 @@
 
 namespace MediaWiki\Page;
 
-use MovePage;
 use Title;
 
 /**

includes/page/PageCommandFactory.php

@@ -43,8 +43,6 @@ use MediaWiki\User\ActorNormalization;
 use MediaWiki\User\UserEditTracker;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;
-use MergeHistory;
-use MovePage;
 use NamespaceInfo;
 use Psr\Log\LoggerInterface;
 use ReadOnlyMode;

includes/page/ProtectionForm.php

@@ -23,6 +23,15 @@
  * @file
  */
 
+namespace MediaWiki\Page;
+
+use Article;
+use ErrorPageError;
+use HTMLForm;
+use IContextSource;
+use Language;
+use LogEventsList;
+use LogPage;
 use MediaWiki\CommentStore\CommentStore;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Html\Html;
@@ -32,6 +41,12 @@ use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Permissions\PermissionStatus;
 use MediaWiki\Permissions\RestrictionStore;
 use MediaWiki\Watchlist\WatchlistManager;
+use OutputPage;
+use Title;
+use TitleFormatter;
+use WebRequest;
+use Xml;
+use XmlSelect;
 
 /**
  * Handles the page protection UI and backend
@@ -647,3 +662,5 @@ class ProtectionForm {
 		$this->hookRunner->onProtectionForm__showLogExtract( $this->mArticle, $this->mOut );
 	}
 }
+
+class_alias( ProtectionForm::class, 'ProtectionForm' );

includes/parser/Parser.php

@@ -21,7 +21,6 @@
  * @ingroup Parser
  */
 
-use MediaWiki\BadFileLookup;
 use MediaWiki\Cache\CacheKeyHelper;
 use MediaWiki\Category\TrackingCategories;
 use MediaWiki\Config\ServiceOptions;
@@ -37,6 +36,7 @@ use MediaWiki\Linker\LinkRendererFactory;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Page\File\BadFileLookup;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Parser\MagicWordArray;

includes/parser/ParserFactory.php

@@ -19,13 +19,13 @@
  * @ingroup Parser
  */
 
-use MediaWiki\BadFileLookup;
 use MediaWiki\Category\TrackingCategories;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Http\HttpRequestFactory;
 use MediaWiki\Languages\LanguageConverterFactory;
 use MediaWiki\Linker\LinkRendererFactory;
+use MediaWiki\Page\File\BadFileLookup;
 use MediaWiki\Parser\MagicWordFactory;
 use MediaWiki\Preferences\SignatureValidatorFactory;
 use MediaWiki\SpecialPage\SpecialPageFactory;

includes/parser/Parsoid/Config/DataAccess.php

@@ -22,7 +22,6 @@ namespace MediaWiki\Parser\Parsoid\Config;
 use ContentHandler;
 use File;
 use MediaTransformError;
-use MediaWiki\BadFileLookup;
 use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Content\Transform\ContentTransformer;
@@ -30,6 +29,7 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Linker\Linker;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Page\File\BadFileLookup;
 use Parser;
 use ParserFactory;
 use ReadOnlyMode;

includes/search/searchwidgets/FullSearchResultWidget.php

@@ -375,6 +375,7 @@ class FullSearchResultWidget implements SearchResultWidget {
 		if ( $thumb ) {
 			if ( $title->getNamespace() === NS_FILE ) {
 				// don't use a custom link, just use traditional thumbnail HTML
+				// @phan-suppress-next-line SecurityCheck-DoubleEscaped
 				return $thumb->toHtml( [
 					'desc-link' => true,
 					'loading' => 'lazy',
@@ -383,6 +384,7 @@ class FullSearchResultWidget implements SearchResultWidget {
 			}
 
 			// thumbnails for non-file results should link to the relevant title
+			// @phan-suppress-next-line SecurityCheck-DoubleEscaped
 			return $thumb->toHtml( [
 				'desc-link' => true,
 				'custom-title-link' => $title,

tests/phpunit/includes/MergeHistoryTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\MainConfigNames;
+use MediaWiki\Page\MergeHistory;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 
 /**

tests/phpunit/includes/MovePageTest.php

@@ -4,6 +4,7 @@ use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Interwiki\InterwikiLookup;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Page\MovePage;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Tests\Rest\Handler\MediaTestTrait;

tests/phpunit/includes/api/ApiUploadTestCase.php

@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\MainConfigNames;
+use Mediawiki\Page\File\FileDeleteForm;
 
 /**
  * Abstract class to support upload tests

tests/phpunit/includes/parser/ParserTest.php

@@ -3,6 +3,7 @@
 use MediaWiki\Category\TrackingCategories;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Http\HttpRequestFactory;
+use MediaWiki\Page\File\BadFileLookup;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageReferenceValue;
 use MediaWiki\Parser\MagicWord;
@@ -56,7 +57,7 @@ class ParserTest extends MediaWikiIntegrationTestCase {
 			$this->createMock( MediaWiki\Linker\LinkRendererFactory::class ),
 			$this->createMock( NamespaceInfo::class ),
 			new Psr\Log\NullLogger(),
-			$this->createMock( MediaWiki\BadFileLookup::class ),
+			$this->createMock( BadFileLookup::class ),
 			$this->createMock( MediaWiki\Languages\LanguageConverterFactory::class ),
 			$this->createMock( MediaWiki\HookContainer\HookContainer::class ),
 			$this->createMock( MediaWiki\Tidy\TidyDriverBase::class ),

tests/phpunit/includes/upload/UploadFromUrlTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\MainConfigNames;
+use Mediawiki\Page\File\FileDeleteForm;
 use Wikimedia\TestingAccessWrapper;
 
 /**

tests/phpunit/unit/includes/BadFileLookupTest.php

@@ -1,11 +1,11 @@
 <?php
 
-use MediaWiki\BadFileLookup;
 use MediaWiki\HookContainer\HookContainer;
+use MediaWiki\Page\File\BadFileLookup;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 
 /**
- * @coversDefaultClass MediaWiki\BadFileLookup
+ * @coversDefaultClass \MediaWiki\Page\File\BadFileLookup
  */
 class BadFileLookupTest extends MediaWikiUnitTestCase {
 	use DummyServicesTrait;

tests/phpunit/unit/includes/MovePageTest.php

@@ -3,13 +3,13 @@
 namespace MediaWiki\Tests\Unit;
 
 use MediaWiki\EditPage\SpamChecker;
+use MediaWiki\Page\MovePage;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Permissions\PermissionStatus;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 use MediaWikiUnitTestCase;
 use MockTitleTrait;
-use MovePage;
 
 /**
  * @coversDefaultClass MovePage

tests/phpunit/unit/includes/page/PageCommandFactoryTest.php

@@ -6,6 +6,8 @@ use ContentModelChange;
 use HashConfig;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\DeletePage;
+use MediaWiki\Page\MergeHistory;
+use MediaWiki\Page\MovePage;
 use MediaWiki\Page\PageCommandFactory;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageIdentityValue;
@@ -16,8 +18,6 @@ use MediaWiki\Permissions\Authority;
 use MediaWiki\Tests\Unit\MockServiceDependenciesTrait;
 use MediaWiki\User\UserIdentity;
 use MediaWikiUnitTestCase;
-use MergeHistory;
-use MovePage;
 use Title;
 use WikiPage;
 

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

@@ -1,11 +1,11 @@
 <?php
 
-use MediaWiki\BadFileLookup;
 use MediaWiki\Category\TrackingCategories;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Http\HttpRequestFactory;
 use MediaWiki\Languages\LanguageConverterFactory;
 use MediaWiki\Linker\LinkRendererFactory;
+use MediaWiki\Page\File\BadFileLookup;
 use MediaWiki\Parser\MagicWord;
 use MediaWiki\Parser\MagicWordFactory;
 use MediaWiki\Preferences\SignatureValidatorFactory;