Reorg: Move EditPage.php to MediaWiki\EditPage

Also moving TemplatesOnThisPageFormatter to the same namesapce as it's
only used by EditPage

Bug: T321882
Change-Id: Ibefc44eb64aedb430148b109090584c3e35794ab

autoload.php

@@ -420,7 +420,7 @@ $wgAutoloadLocalClasses = [
 	'EasyDeflate' => __DIR__ . '/includes/libs/Deflate.php',
 	'EditAction' => __DIR__ . '/includes/actions/EditAction.php',
 	'EditCLI' => __DIR__ . '/maintenance/edit.php',
-	'EditPage' => __DIR__ . '/includes/EditPage.php',
+	'EditPage' => __DIR__ . '/includes/editpage/EditPage.php',
 	'EditWatchlistCheckboxSeriesField' => __DIR__ . '/includes/specials/formfields/EditWatchlistCheckboxSeriesField.php',
 	'EditWatchlistNormalHTMLForm' => __DIR__ . '/includes/specials/forms/EditWatchlistNormalHTMLForm.php',
 	'EmailNotification' => __DIR__ . '/includes/mail/EmailNotification.php',
@@ -1071,8 +1071,10 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\EditPage\\Constraint\\UnicodeConstraint' => __DIR__ . '/includes/editpage/Constraint/UnicodeConstraint.php',
 	'MediaWiki\\EditPage\\Constraint\\UserBlockConstraint' => __DIR__ . '/includes/editpage/Constraint/UserBlockConstraint.php',
 	'MediaWiki\\EditPage\\Constraint\\UserRateLimitConstraint' => __DIR__ . '/includes/editpage/Constraint/UserRateLimitConstraint.php',
+	'MediaWiki\\EditPage\\EditPage' => __DIR__ . '/includes/editpage/EditPage.php',
 	'MediaWiki\\EditPage\\IEditObject' => __DIR__ . '/includes/editpage/IEditObject.php',
 	'MediaWiki\\EditPage\\SpamChecker' => __DIR__ . '/includes/editpage/SpamChecker.php',
+	'MediaWiki\\EditPage\\TemplatesOnThisPageFormatter' => __DIR__ . '/includes/editpage/TemplatesOnThisPageFormatter.php',
 	'MediaWiki\\EditPage\\TextConflictHelper' => __DIR__ . '/includes/editpage/TextConflictHelper.php',
 	'MediaWiki\\EditPage\\TextboxBuilder' => __DIR__ . '/includes/editpage/TextboxBuilder.php',
 	'MediaWiki\\Edit\\ParsoidOutputStash' => __DIR__ . '/includes/edit/ParsoidOutputStash.php',
@@ -2566,7 +2568,7 @@ $wgAutoloadLocalClasses = [
 	'TempFSFile' => __DIR__ . '/includes/libs/filebackend/fsfile/TempFSFile.php',
 	'TempFileRepo' => __DIR__ . '/includes/filerepo/TempFileRepo.php',
 	'TemplateParser' => __DIR__ . '/includes/TemplateParser.php',
-	'TemplatesOnThisPageFormatter' => __DIR__ . '/includes/TemplatesOnThisPageFormatter.php',
+	'TemplatesOnThisPageFormatter' => __DIR__ . '/includes/editpage/TemplatesOnThisPageFormatter.php',
 	'TextContent' => __DIR__ . '/includes/content/TextContent.php',
 	'TextContentHandler' => __DIR__ . '/includes/content/TextContentHandler.php',
 	'TextPassDumper' => __DIR__ . '/maintenance/includes/TextPassDumper.php',

includes/Hook/AlternateEditHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use EditPage;
+use MediaWiki\EditPage\EditPage;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/Hook/AlternateEditPreviewHook.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Hook;
 
 use Content;
-use EditPage;
+use MediaWiki\EditPage\EditPage;
 use ParserOutput;
 
 /**

includes/Hook/EditFilterHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use EditPage;
+use MediaWiki\EditPage\EditPage;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/Hook/EditFormInitialTextHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use EditPage;
+use MediaWiki\EditPage\EditPage;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/Hook/EditPageBeforeConflictDiffHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use EditPage;
+use MediaWiki\EditPage\EditPage;
 use OutputPage;
 
 /**

includes/Hook/EditPageBeforeEditButtonsHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use EditPage;
+use MediaWiki\EditPage\EditPage;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/Hook/EditPageGetCheckboxesDefinitionHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use EditPage;
+use MediaWiki\EditPage\EditPage;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/Hook/EditPageGetDiffContentHook.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Hook;
 
 use Content;
-use EditPage;
+use MediaWiki\EditPage\EditPage;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/Hook/EditPageGetPreviewContentHook.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Hook;
 
 use Content;
-use EditPage;
+use MediaWiki\EditPage\EditPage;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/Hook/EditPageNoSuchSectionHook.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Hook;
 
-use EditPage;
+use MediaWiki\EditPage\EditPage;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/Hook/EditPage__attemptSaveHook.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Hook;
 
 // phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps
-use EditPage;
+use MediaWiki\EditPage\EditPage;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/Hook/EditPage__attemptSave_afterHook.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Hook;
 
 // phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps
-use EditPage;
+use MediaWiki\EditPage\EditPage;
 use Status;
 
 /**

includes/Hook/EditPage__importFormDataHook.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Hook;
 
 // phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps
-use EditPage;
+use MediaWiki\EditPage\EditPage;
 use WebRequest;
 
 /**

includes/Hook/EditPage__showEditForm_fieldsHook.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Hook;
 
 // phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps
-use EditPage;
+use MediaWiki\EditPage\EditPage;
 use OutputPage;
 
 /**

includes/Hook/EditPage__showEditForm_initialHook.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Hook;
 
 // phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps
-use EditPage;
+use MediaWiki\EditPage\EditPage;
 use OutputPage;
 
 /**

includes/Hook/EditPage__showReadOnlyForm_initialHook.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Hook;
 
 // phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps
-use EditPage;
+use MediaWiki\EditPage\EditPage;
 use OutputPage;
 
 /**

includes/Hook/EditPage__showStandardInputs_optionsHook.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Hook;
 
 // phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps
-use EditPage;
+use MediaWiki\EditPage\EditPage;
 use OutputPage;
 
 /**

includes/actions/EditAction.php

@@ -18,6 +18,7 @@
  * @ingroup Actions
  */
 
+use MediaWiki\EditPage\EditPage;
 use MediaWiki\MainConfigNames;
 
 /**

includes/actions/InfoAction.php

@@ -24,6 +24,7 @@
 
 use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\Category\Category;
+use MediaWiki\EditPage\TemplatesOnThisPageFormatter;
 use MediaWiki\Languages\LanguageNameUtils;
 use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;

includes/api/ApiEditPage.php

@@ -21,6 +21,7 @@
  */
 
 use MediaWiki\Content\IContentHandlerFactory;
+use MediaWiki\EditPage\EditPage;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\RedirectLookup;

includes/api/ApiParse.php

@@ -25,6 +25,7 @@ use MediaWiki\CommentFormatter\CommentFormatter;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Content\Renderer\ContentRenderer;
 use MediaWiki\Content\Transform\ContentTransformer;
+use MediaWiki\EditPage\EditPage;
 use MediaWiki\Language\RawMessage;
 use MediaWiki\Languages\LanguageNameUtils;
 use MediaWiki\Page\PageReference;

includes/editpage/EditPage.php

@@ -20,6 +20,24 @@
  * @file
  */
 
+namespace MediaWiki\EditPage;
+
+use Article;
+use CategoryPage;
+use Config;
+use Content;
+use ContentHandler;
+use DeferredUpdates;
+use DeprecationHelper;
+use DerivativeContext;
+use ErrorPageError;
+use ExternalUserNames;
+use Hooks;
+use Html;
+use IContextSource;
+use LogEventsList;
+use LogPage;
+use ManualLogEntry;
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\CommentStore\CommentStore;
@@ -45,9 +63,6 @@ use MediaWiki\EditPage\Constraint\SpamRegexConstraint;
 use MediaWiki\EditPage\Constraint\UnicodeConstraint;
 use MediaWiki\EditPage\Constraint\UserBlockConstraint;
 use MediaWiki\EditPage\Constraint\UserRateLimitConstraint;
-use MediaWiki\EditPage\IEditObject;
-use MediaWiki\EditPage\TextboxBuilder;
-use MediaWiki\EditPage\TextConflictHelper;
 use MediaWiki\HookContainer\ProtectedHookAccessorTrait;
 use MediaWiki\Language\RawMessage;
 use MediaWiki\Linker\Linker;
@@ -75,13 +90,40 @@ use MediaWiki\User\UserNameUtils;
 use MediaWiki\User\UserOptionsLookup;
 use MediaWiki\User\UserRigorOptions;
 use MediaWiki\Watchlist\WatchlistManager;
+use Message;
+use MessageLocalizer;
+use MWContentSerializationException;
+use MWException;
+use MWUnknownContentModelException;
+use OOUI;
 use OOUI\ButtonWidget;
 use OOUI\CheckboxInputWidget;
 use OOUI\DropdownInputWidget;
 use OOUI\FieldLayout;
+use ParserOptions;
+use ParserOutput;
+use PermissionsError;
+use ReadOnlyError;
+use RecentChange;
+use RuntimeException;
+use Skin;
+use SpecialMyLanguage;
+use SpecialPage;
+use Status;
+use stdClass;
+use TextContent;
+use ThrottledError;
+use Title;
+use User;
+use UserBlockedError;
+use WatchAction;
+use WatchedItemStoreInterface;
+use WebRequest;
 use Wikimedia\Assert\Assert;
 use Wikimedia\Message\MessageValue;
 use Wikimedia\ParamValidator\TypeDef\ExpiryDef;
+use WikiPage;
+use Xml;
 
 /**
  * The edit page/HTML interface (split from Article)
@@ -1848,7 +1890,7 @@ class EditPage implements IEditObject {
 	 * @param PageIdentity|null $page
 	 * @param Authority $performer
 	 * @return bool
-	 * @throws Exception
+	 * @throws \Exception
 	 * @phan-assert-true-condition $page
 	 */
 	private function isPageExistingAndViewable( ?PageIdentity $page, Authority $performer ): bool {
@@ -5066,3 +5108,5 @@ class EditPage implements IEditObject {
 		);
 	}
 }
+
+class_alias( EditPage::class, 'EditPage' );

includes/editpage/TemplatesOnThisPageFormatter.php

@@ -18,11 +18,16 @@
  * @file
  */
 
+namespace MediaWiki\EditPage;
+
+use Html;
+use IContextSource;
 use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Permissions\RestrictionStore;
+use Title;
 
 /**
  * Handles formatting for the "templates used on this page"
@@ -208,3 +213,5 @@ class TemplatesOnThisPageFormatter {
 	}
 
 }
+
+class_alias( TemplatesOnThisPageFormatter::class, 'TemplatesOnThisPageFormatter' );

includes/logging/LogEventsList.php

@@ -677,6 +677,7 @@ class LogEventsList extends ContextSource {
 			$services->getDBLoadBalancer(),
 			$services->getActorNormalization()
 		);
+		// @phan-suppress-next-line PhanImpossibleCondition
 		if ( !$useRequestParams ) {
 			# Reset vars that may have been taken from the request
 			$pager->mLimit = 50;
@@ -685,6 +686,7 @@ class LogEventsList extends ContextSource {
 			$pager->mIsBackwards = false;
 		}
 
+		// @phan-suppress-next-line PhanImpossibleCondition
 		if ( $param['useMaster'] ) {
 			$pager->mDb = wfGetDB( DB_PRIMARY );
 		}
@@ -717,6 +719,7 @@ class LogEventsList extends ContextSource {
 				$loglist->endLogEventsList();
 			// add styles for change tags
 			$context->getOutput()->addModuleStyles( 'mediawiki.interface.helpers.styles' );
+		// @phan-suppress-next-line PhanRedundantCondition
 		} elseif ( $showIfEmpty ) {
 			$s = Html::rawElement( 'div', [ 'class' => 'mw-warning-logempty' ],
 				$context->msg( 'logempty' )->parse() );
@@ -783,7 +786,7 @@ class LogEventsList extends ContextSource {
 			);
 		}
 
-		// @phan-suppress-next-line PhanSuspiciousValueComparison
+		// @phan-suppress-next-line PhanSuspiciousValueComparison, PhanRedundantCondition
 		if ( $wrap != '' ) { // Wrap message in html
 			$s = str_replace( '$1', $s, $wrap );
 		}

includes/page/Article.php

@@ -20,6 +20,7 @@
 
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\CommentFormatter\CommentFormatter;
+use MediaWiki\EditPage\EditPage;
 use MediaWiki\HookContainer\ProtectedHookAccessorTrait;
 use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;

tests/phpunit/includes/EditPageConstraintsTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\EditPage\EditPage;
 use MediaWiki\EditPage\SpamChecker;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Permissions\PermissionManager;

tests/phpunit/includes/EditPageTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\EditPage\EditPage;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MainConfigSchema;
 use MediaWiki\Request\FauxRequest;

tests/phpunit/integration/includes/Storage/UndoIntegrationTest.php

@@ -3,8 +3,8 @@
 namespace MediaWiki\Tests\Storage;
 
 use Article;
-use EditPage;
 use McrUndoAction;
+use MediaWiki\EditPage\EditPage;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Revision\RevisionStoreRecord;
 use MediaWiki\Revision\SlotRecord;

tests/phpunit/unit/includes/editpage/IEditObjectTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\EditPage\EditPage;
 use MediaWiki\EditPage\IEditObject;
 
 /**