Merge "Reorg: Move three output related classes to includes/Output/"

.phan/config.php

@@ -175,7 +175,7 @@ $cfg['globals_type_map'] = array_merge( $cfg['globals_type_map'], [
 	'wgLocalInterwikis' => 'string[]',
 	'wgDebugLogGroups' => 'string|false|array{destination:string,sample?:int,level:int}',
 	'wgCookiePrefix' => 'string|false',
-	'wgOut' => 'OutputPage',
+	'wgOut' => 'MediaWiki\Output\OutputPage',
 	'wgExtraNamespaces' => 'string[]',
 ] );
 

RELEASE-NOTES-1.41

@@ -675,6 +675,9 @@ because of Phabricator reports.
   - MediaWiki\ExtensionInfo -> MediaWiki\Utils\ExtensionInfo
   - GitInfo -> MediaWiki\Utils\GitInfo
   - MWTimestamp -> MediaWiki\Utils\MWTimestamp
+  - OutputHandler -> MediaWiki\Output\OutputHandler
+  - OutputPage -> MediaWiki\Output\OutputPage
+  - StreamFile -> MediaWiki\Output\StreamFile
 * The following methods, previously deprecated, now emit deprecation warnings:
   - ConfigFactory::getDefaultInstance(), deprecated since 1.27
   - AbstractContent::getNativeData(), deprecated since 1.33

autoload.php

@@ -1530,7 +1530,10 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Message\\TextFormatter' => __DIR__ . '/includes/Message/TextFormatter.php',
 	'MediaWiki\\Message\\UserGroupMembershipParam' => __DIR__ . '/includes/Message/UserGroupMembershipParam.php',
 	'MediaWiki\\Navigation\\PagerNavigationBuilder' => __DIR__ . '/includes/Navigation/PagerNavigationBuilder.php',
-	'MediaWiki\\OutputHandler' => __DIR__ . '/includes/OutputHandler.php',
+	'MediaWiki\\OutputHandler' => __DIR__ . '/includes/Output/OutputHandler.php',
+	'MediaWiki\\Output\\OutputHandler' => __DIR__ . '/includes/Output/OutputHandler.php',
+	'MediaWiki\\Output\\OutputPage' => __DIR__ . '/includes/Output/OutputPage.php',
+	'MediaWiki\\Output\\StreamFile' => __DIR__ . '/includes/Output/StreamFile.php',
 	'MediaWiki\\Page\\ContentModelChangeFactory' => __DIR__ . '/includes/page/ContentModelChangeFactory.php',
 	'MediaWiki\\Page\\DeletePage' => __DIR__ . '/includes/page/DeletePage.php',
 	'MediaWiki\\Page\\DeletePageFactory' => __DIR__ . '/includes/page/DeletePageFactory.php',
@@ -2251,7 +2254,7 @@ $wgAutoloadLocalClasses = [
 	'OldRevisionImporter' => __DIR__ . '/includes/import/OldRevisionImporter.php',
 	'OrderedStreamingForkController' => __DIR__ . '/includes/Maintenance/OrderedStreamingForkController.php',
 	'OrphanStats' => __DIR__ . '/maintenance/storage/orphanStats.php',
-	'OutputPage' => __DIR__ . '/includes/OutputPage.php',
+	'OutputPage' => __DIR__ . '/includes/Output/OutputPage.php',
 	'PHPVersionCheck' => __DIR__ . '/includes/PHPVersionCheck.php',
 	'PNGHandler' => __DIR__ . '/includes/media/PNGHandler.php',
 	'PNGMetadataExtractor' => __DIR__ . '/includes/media/PNGMetadataExtractor.php',
@@ -2683,7 +2686,7 @@ $wgAutoloadLocalClasses = [
 	'StatusValue' => __DIR__ . '/includes/libs/StatusValue.php',
 	'StorageTypeStats' => __DIR__ . '/maintenance/storage/storageTypeStats.php',
 	'StoreFileOp' => __DIR__ . '/includes/libs/filebackend/fileop/StoreFileOp.php',
-	'StreamFile' => __DIR__ . '/includes/StreamFile.php',
+	'StreamFile' => __DIR__ . '/includes/Output/StreamFile.php',
 	'StringPrefixSearch' => __DIR__ . '/includes/search/StringPrefixSearch.php',
 	'StringUtils' => __DIR__ . '/includes/libs/StringUtils.php',
 	'StripState' => __DIR__ . '/includes/parser/StripState.php',

includes/Feed/FeedUtils.php

@@ -28,10 +28,10 @@ use LogFormatter;
 use MediaWiki\Html\Html;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Title\Title;
-use OutputPage;
 use RequestContext;
 use TextContent;
 use User;

includes/Hook/AfterFinalPageOutputHook.php

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

includes/Hook/BeforeInitializeHook.php

@@ -3,8 +3,8 @@
 namespace MediaWiki\Hook;
 
 use MediaWiki;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Title\Title;
-use OutputPage;
 use User;
 use WebRequest;
 

includes/Hook/BeforePageDisplayHook.php

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

includes/Hook/BeforePageRedirectHook.php

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

includes/Hook/EditPageBeforeConflictDiffHook.php

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

includes/Hook/EditPage__showEditForm_fieldsHook.php

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

includes/Hook/EditPage__showEditForm_initialHook.php

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

includes/Hook/EditPage__showReadOnlyForm_initialHook.php

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

includes/Hook/EditPage__showStandardInputs_optionsHook.php

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

includes/Hook/GetCacheVaryCookiesHook.php

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

includes/Hook/MakeGlobalVariablesScriptHook.php

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

includes/Hook/MediaWikiPerformActionHook.php

@@ -4,8 +4,8 @@ namespace MediaWiki\Hook;
 
 use Article;
 use MediaWiki;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Title\Title;
-use OutputPage;
 use User;
 use WebRequest;
 

includes/Hook/OutputPageAfterGetHeadLinksArrayHook.php

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

includes/Hook/OutputPageBeforeHTMLHook.php

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

includes/Hook/OutputPageBodyAttributesHook.php

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

includes/Hook/OutputPageCheckLastModifiedHook.php

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

includes/Hook/OutputPageMakeCategoryLinksHook.php

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

includes/Hook/OutputPageParserOutputHook.php

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

includes/Hook/ProtectionForm__showLogExtractHook.php

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

includes/Hook/TestCanonicalRedirectHook.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Hook;
 
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Title\Title;
-use OutputPage;
 use WebRequest;
 
 /**

includes/Html/ListToggle.php

@@ -22,7 +22,7 @@
 
 namespace MediaWiki\Html;
 
-use OutputPage;
+use MediaWiki\Output\OutputPage;
 
 /**
  * Class for generating clickable toggle links for a list of checkboxes.

includes/Output/OutputHandler.php

@@ -20,9 +20,11 @@
  * @file
  */
 
-namespace MediaWiki;
+namespace MediaWiki\Output;
 
 use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\MainConfigNames;
+use MediaWiki\MediaWikiServices;
 
 /**
  * @since 1.31
@@ -204,3 +206,8 @@ class OutputHandler {
 		}
 	}
 }
+
+/**
+ * @deprecated since 1.41
+ */
+class_alias( OutputHandler::class, 'MediaWiki\\OutputHandler' );

includes/Output/OutputPage.php

@@ -20,6 +20,22 @@
  * @file
  */
 
+namespace MediaWiki\Output;
+
+use Article;
+use Config;
+use Content;
+use ContextSource;
+use CSSJanus;
+use Exception;
+use ExtensionRegistry;
+use File;
+use HtmlArmor;
+use IContextSource;
+use InvalidArgumentException;
+use JavaScriptContent;
+use LanguageCode;
+use LinkCache;
 use MediaWiki\HookContainer\ProtectedHookAccessorTrait;
 use MediaWiki\Html\Html;
 use MediaWiki\Linker\LinkTarget;
@@ -36,6 +52,21 @@ use MediaWiki\ResourceLoader\ResourceLoader;
 use MediaWiki\Session\SessionManager;
 use MediaWiki\Title\Title;
 use MediaWiki\Utils\MWTimestamp;
+use Message;
+use MWDebug;
+use MWException;
+use OOUI\Element;
+use OOUI\Theme;
+use Parser;
+use ParserOptions;
+use ParserOutput;
+use RequestContext;
+use Sanitizer;
+use Skin;
+use SpecialPage;
+use TextContent;
+use TitleValue;
+use WebRequest;
 use Wikimedia\AtEase\AtEase;
 use Wikimedia\LightweightObjectStore\ExpirationAwareness;
 use Wikimedia\Parsoid\Core\TOCData;
@@ -2299,7 +2330,7 @@ class OutputPage extends ContextSource {
 	/**
 	 * Add the output of a QuickTemplate to the output buffer
 	 *
-	 * @param QuickTemplate &$template
+	 * @param \QuickTemplate &$template
 	 */
 	public function addTemplate( &$template ) {
 		$this->addHTML( $template->getHTML() );
@@ -3245,7 +3276,7 @@ class OutputPage extends ContextSource {
 	 *  or ResourceLoader available; this should ideally be to a page that provides similar
 	 *  functionality without requiring JavaScript
 	 * @param string|Message $msg Message key (string) for page text, or a Message object
-	 * @param string|string[]|MessageSpecifier $params Message parameters; ignored if $msg
+	 * @param string|string[]|\MessageSpecifier $params Message parameters; ignored if $msg
 	 *  is a Message object
 	 */
 	public function showPendingTakeover(
@@ -4638,8 +4669,8 @@ class OutputPage extends ContextSource {
 			$theme = $themes[$skinName] ?? $themes['default'];
 			// For example, 'OOUI\WikimediaUITheme'.
 			$themeClass = "OOUI\\{$theme}Theme";
-			OOUI\Theme::setSingleton( new $themeClass() );
-			OOUI\Element::setDefaultDir( $dir );
+			Theme::setSingleton( new $themeClass() );
+			Element::setDefaultDir( $dir );
 		}
 	}
 
@@ -4722,3 +4753,8 @@ class OutputPage extends ContextSource {
 		return WrappedStringList::join( "\n", $tail );
 	}
 }
+
+/**
+ * @deprecated since 1.41
+ */
+class_alias( OutputPage::class, 'OutputPage' );

includes/Output/StreamFile.php

@@ -21,8 +21,14 @@
  * @file
  */
 
+namespace MediaWiki\Output;
+
+use FileBackend;
+use HTTPFileStreamer;
+use InvalidArgumentException;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use UploadBase;
 
 /**
  * Functions related to the output of file content
@@ -48,7 +54,11 @@ class StreamFile {
 	 * @return bool Success
 	 */
 	public static function stream(
-		$fname, $headers = [], $sendErrors = true, $optHeaders = [], $flags = 0
+		$fname,
+		$headers = [],
+		$sendErrors = true,
+		$optHeaders = [],
+		$flags = 0
 	) {
 		if ( FileBackend::isStoragePath( $fname ) ) {
 			throw new InvalidArgumentException( __FUNCTION__ . " given storage path '$fname'." );
@@ -117,8 +127,10 @@ class StreamFile {
 			if ( UploadBase::checkFileExtensionList( $extList, $prohibitedFileExtensions ) ) {
 				return 'unknown/unknown';
 			}
-			if ( $checkFileExtensions && $strictFileExtensions
-				&& !UploadBase::checkFileExtensionList( $extList, $fileExtensions )
+			if (
+				$checkFileExtensions &&
+				$strictFileExtensions &&
+				!UploadBase::checkFileExtensionList( $extList, $fileExtensions )
 			) {
 				return 'unknown/unknown';
 			}
@@ -129,3 +141,8 @@ class StreamFile {
 		return $type;
 	}
 }
+
+/**
+ * @deprecated since 1.41
+ */
+class_alias( StreamFile::class, 'StreamFile' );

includes/ResourceLoader/FileModule.php

@@ -31,8 +31,8 @@ use LogicException;
 use MediaWiki\Languages\LanguageFallback;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 use ObjectCache;
-use OutputPage;
 use RuntimeException;
 use Wikimedia\Minify\CSSMin;
 use Wikimedia\RequestTimeout\TimeoutException;

includes/ResourceLoader/ResourceLoader.php

@@ -39,6 +39,7 @@ use MediaWiki\Html\Html;
 use MediaWiki\Html\HtmlJsCode;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Profiler\ProfilingContext;
 use MediaWiki\Request\HeaderCallback;
 use MediaWiki\Title\Title;
@@ -48,7 +49,6 @@ use MWExceptionHandler;
 use MWExceptionRenderer;
 use Net_URL2;
 use ObjectCache;
-use OutputPage;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;

includes/ResourceLoader/SkinModule.php

@@ -23,7 +23,7 @@ use Config;
 use ConfigException;
 use InvalidArgumentException;
 use MediaWiki\MainConfigNames;
-use OutputPage;
+use MediaWiki\Output\OutputPage;
 use Wikimedia\Minify\CSSMin;
 
 /**

includes/Setup.php

@@ -547,7 +547,7 @@ register_shutdown_function( static function () {
 $wgLang = new StubUserLang;
 
 /**
- * @var OutputPage $wgOut
+ * @var MediaWiki\Output\OutputPage $wgOut
  */
 $wgOut = RequestContext::getMain()->getOutput(); // BackCompat
 

includes/WebStart.php

@@ -80,7 +80,7 @@ function wfWebStartSetup( SettingsBuilder $settings ) {
 		// premature sending of HTTP headers due to output from PHP warnings and notices.
 		// They also can be used to implement gzip support in PHP without the webserver knowing
 		// which requests yield HTML and which yield large files that can be streamed.
-		ob_start( 'MediaWiki\\OutputHandler::handle' );
+		ob_start( 'MediaWiki\\Output\\OutputHandler::handle' );
 	}
 }
 

includes/actions/Action.php

@@ -22,6 +22,7 @@
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Title\Title;
 

includes/actions/RevertAction.php

@@ -24,6 +24,7 @@
  */
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Status\Status;
 use MediaWiki\Utils\MWTimestamp;
 

includes/api/ApiFormatBase.php

@@ -23,6 +23,7 @@
 use MediaWiki\Html\Html;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 use Wikimedia\ParamValidator\ParamValidator;
 
 /**

includes/api/ApiHelp.php

@@ -25,6 +25,7 @@ use MediaWiki\Html\HtmlHelper;
 use MediaWiki\Linker\Linker;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Title\Title;
 use MediaWiki\Utils\ExtensionInfo;
 use Wikimedia\ParamValidator\ParamValidator;

includes/api/ApiParse.php

@@ -28,6 +28,7 @@ use MediaWiki\Content\Transform\ContentTransformer;
 use MediaWiki\EditPage\EditPage;
 use MediaWiki\Language\RawMessage;
 use MediaWiki\Languages\LanguageNameUtils;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\WikiPageFactory;
 use MediaWiki\Parser\ParserOutputFlags;

includes/api/Hook/ApiParseMakeOutputPageHook.php

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

includes/context/ContextSource.php

@@ -18,6 +18,7 @@
  * @file
  */
 
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Session\CsrfTokenSet;
 use MediaWiki\Title\Title;

includes/context/DerivativeContext.php

@@ -19,6 +19,7 @@
  * @file
  */
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Title\Title;
 use Wikimedia\Assert\Assert;

includes/context/IContextSource.php

@@ -18,6 +18,7 @@
  * @file
  */
 
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Session\CsrfTokenSetProvider;
 use MediaWiki\Title\Title;

includes/context/MutableContext.php

@@ -18,6 +18,7 @@
  * @file
  */
 
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Title\Title;
 

includes/context/RequestContext.php

@@ -26,6 +26,7 @@ use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Session\CsrfTokenSet;

includes/debug/MWDebug.php

@@ -22,6 +22,7 @@
 
 use MediaWiki\Html\Html;
 use MediaWiki\Logger\LegacyLogger;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\ResourceLoader\ResourceLoader;
 use MediaWiki\Utils\GitInfo;
 use Wikimedia\WrappedString;

includes/diff/DifferenceEngineSlotDiffRenderer.php

@@ -21,6 +21,7 @@
  * @ingroup DifferenceEngine
  */
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 
 /**
  * B/C adapter for turning a DifferenceEngine into a SlotDiffRenderer.

includes/diff/Hook/ArticleContentOnDiffHook.php

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

includes/diff/Hook/DifferenceEngineRenderRevisionAddParserOutputHook.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Diff\Hook;
 
 use DifferenceEngine;
-use OutputPage;
+use MediaWiki\Output\OutputPage;
 use ParserOutput;
 use WikiPage;
 

includes/diff/Hook/DifferenceEngineShowDiffPageHook.php

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

includes/diff/SlotDiffRenderer.php

@@ -20,6 +20,8 @@
  * @file
  * @ingroup DifferenceEngine
  */
+
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Title\Title;
 use Wikimedia\Assert\Assert;
 

includes/diff/TextDiffer/BaseTextDiffer.php

@@ -3,8 +3,8 @@
 namespace MediaWiki\Diff\TextDiffer;
 
 use MediaWiki\Html\Html;
+use MediaWiki\Output\OutputPage;
 use MessageLocalizer;
-use OutputPage;
 
 /**
  * The base class for specific implementations of TextDiffer, apart from

includes/diff/TextDiffer/ManifoldTextDiffer.php

@@ -4,8 +4,8 @@ namespace MediaWiki\Diff\TextDiffer;
 
 use DomainException;
 use Language;
+use MediaWiki\Output\OutputPage;
 use MessageLocalizer;
-use OutputPage;
 use UnexpectedValueException;
 
 /**

includes/diff/TextDiffer/TextDiffer.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Diff\TextDiffer;
 
-use OutputPage;
+use MediaWiki\Output\OutputPage;
 
 /**
  * An interface for parts of a diff page view which represent changes to text

includes/editpage/TextConflictHelper.php

@@ -25,9 +25,9 @@ use ContentHandler;
 use IBufferingStatsdDataFactory;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Html\Html;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Title\Title;
 use MWUnknownContentModelException;
-use OutputPage;
 use User;
 
 /**

includes/filebackend/FileBackendGroup.php

@@ -26,6 +26,7 @@ use MediaWiki\FileBackend\FSFile\TempFSFileFactory;
 use MediaWiki\FileBackend\LockManager\LockManagerGroupFactory;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Output\StreamFile;
 use MediaWiki\Status\Status;
 use Wikimedia\ObjectFactory\ObjectFactory;
 use Wikimedia\Rdbms\ConfiguredReadOnlyMode;

includes/filerepo/FileBackendDBRepoWrapper.php

@@ -18,6 +18,7 @@
  * @file
  */
 
+use MediaWiki\Output\StreamFile;
 use Wikimedia\Rdbms\DBConnRef;
 
 /**

includes/linkeddata/PageDataRequestHandler.php

@@ -19,6 +19,7 @@
  */
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Title\Title;
 use Wikimedia\Http\HttpAcceptNegotiator;

includes/logging/LogEventsList.php

@@ -29,6 +29,7 @@ use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Status\Status;

includes/media/MediaTransformOutput.php

@@ -24,6 +24,7 @@
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\StreamFile;
 use MediaWiki\Status\Status;
 
 /**

includes/page/Article.php

@@ -28,6 +28,7 @@ use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Page\ParserOutputAccess;
 use MediaWiki\Page\ProtectionForm;
 use MediaWiki\Page\WikiPageFactory;

includes/page/Hook/ArticleConfirmDeleteHook.php

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

includes/page/Hook/ArticleDeleteAfterSuccessHook.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Page\Hook;
 
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Title\Title;
-use OutputPage;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/page/Hook/ArticleRevisionViewCustomHook.php

@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Page\Hook;
 
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Title\Title;
-use OutputPage;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/page/Hook/ImageOpenShowImageInlineBeforeHook.php

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

includes/page/ProtectionForm.php

@@ -36,13 +36,13 @@ use MediaWiki\CommentStore\CommentStore;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Html\Html;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Permissions\PermissionStatus;
 use MediaWiki\Permissions\RestrictionStore;
 use MediaWiki\Title\Title;
 use MediaWiki\Watchlist\WatchlistManager;
-use OutputPage;
 use TitleFormatter;
 use WebRequest;
 use Xml;

includes/parser/Parser.php

@@ -36,6 +36,7 @@ use MediaWiki\Linker\LinkRendererFactory;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Page\File\BadFileLookup;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageReference;

includes/parser/ParserOutput.php

@@ -11,6 +11,7 @@ use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Parser\ParserOutputFlags;
 use MediaWiki\Parser\ParserOutputStringSets;

includes/parser/ParserOutputStringSets.php

@@ -41,7 +41,7 @@ class ParserOutputStringSets {
 
 	/**
 	 * @var string ResourceLoader modules to load.
-	 * @see \OutputPage::addModules
+	 * @see \MediaWiki\Output\OutputPage::addModules
 	 * @see \ParserOutput::addModules
 	 * @see \ParserOutput::getModules
 	 */
@@ -49,7 +49,7 @@ class ParserOutputStringSets {
 
 	/**
 	 * @var string Style-only ResourceLoader modules to load.
-	 * @see \OutputPage::addModuleStyles
+	 * @see \MediaWiki\Output\OutputPage::addModuleStyles
 	 * @see \ParserOutput::addModuleStyles
 	 * @see \ParserOutput::getModuleStyles
 	 */

includes/preferences/DefaultPreferencesFactory.php

@@ -39,6 +39,7 @@ use MediaWiki\Languages\LanguageNameUtils;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
@@ -50,7 +51,6 @@ use Message;
 use MessageLocalizer;
 use MWException;
 use NamespaceInfo;
-use OutputPage;
 use Parser;
 use ParserFactory;
 use ParserOptions;

includes/search/searchwidgets/InterwikiSearchResultSetWidget.php

@@ -26,7 +26,7 @@ class InterwikiSearchResultSetWidget implements SearchResultSetWidget {
 	protected $linkRenderer;
 	/** @var InterwikiLookup */
 	protected $iwLookup;
-	/** @var \OutputPage */
+	/** @var \MediaWiki\Output\OutputPage */
 	protected $output;
 	/** @var bool */
 	protected $showMultimedia;

includes/skins/Hook/GetNewMessagesAlertHook.php

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

includes/skins/Hook/SkinSubPageSubtitleHook.php

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

includes/skins/Hook/SkinTemplateGetLanguageLinkHook.php

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

includes/skins/Skin.php

@@ -22,6 +22,7 @@ use MediaWiki\HookContainer\ProtectedHookAccessorTrait;
 use MediaWiki\Html\Html;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\ResourceLoader as RL;
 use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Revision\RevisionStore;

includes/skins/SkinFallback.php

@@ -9,6 +9,7 @@
 use MediaWiki\Html\Html;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 
 /**
  * SkinTemplate class for the fallback skin

includes/skins/components/SkinComponentRegistryContext.php

@@ -22,9 +22,9 @@ use Config;
 use IContextSource;
 use Language;
 use MediaWiki\HookContainer\ProtectedHookAccessorTrait;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Title\Title;
 use MessageLocalizer;
-use OutputPage;
 use Skin;
 use User;
 use WikiPage;

includes/skins/components/SkinComponentTableOfContents.php

@@ -18,8 +18,8 @@
 
 namespace MediaWiki\Skin;
 
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Parser\ParserOutputFlags;
-use OutputPage;
 
 /**
  * @internal for use inside Skin and SkinTemplate classes only

includes/specialpage/ImageQueryPage.php

@@ -21,6 +21,7 @@
  * @ingroup SpecialPage
  */
 
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Title\Title;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IResultWrapper;

includes/specialpage/QueryPage.php

@@ -26,6 +26,7 @@ use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Specials\SpecialAncientPages;
 use MediaWiki\Specials\SpecialBrokenRedirects;
 use MediaWiki\Specials\SpecialDeadendPages;

includes/specialpage/SpecialPage.php

@@ -28,6 +28,7 @@ use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Navigation\PagerNavigationBuilder;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\SpecialPage\SpecialPageFactory;
 use MediaWiki\Title\Title;

includes/specials/Hook/BookInformationHook.php

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

includes/specials/Hook/LanguageSelectorHook.php

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

includes/specials/Hook/SpecialSearchResultsAppendHook.php

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

includes/specials/Hook/SpecialSearchResultsPrependHook.php

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

includes/specials/SpecialExpandTemplates.php

@@ -26,11 +26,11 @@ namespace MediaWiki\Specials;
 use HTMLForm;
 use MediaWiki\Html\Html;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Status\Status;
 use MediaWiki\Tidy\TidyDriverBase;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserOptionsLookup;
-use OutputPage;
 use Parser;
 use ParserFactory;
 use ParserOptions;

includes/specials/SpecialMediaStatistics.php

@@ -27,8 +27,8 @@ namespace MediaWiki\Specials;
 use LogicException;
 use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\Html\Html;
+use MediaWiki\Output\OutputPage;
 use MimeAnalyzer;
-use OutputPage;
 use QueryPage;
 use Skin;
 use SpecialPage;

includes/specials/SpecialSearch.php

@@ -28,6 +28,7 @@ use MediaWiki\Html\Html;
 use MediaWiki\Interwiki\InterwikiLookup;
 use MediaWiki\Languages\LanguageConverterFactory;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Search\SearchResultThumbnailProvider;
 use MediaWiki\Search\SearchWidgets\BasicSearchResultSetWidget;
 use MediaWiki\Search\SearchWidgets\FullSearchResultWidget;

includes/specials/SpecialUserRights.php

@@ -31,6 +31,7 @@ use MediaWiki\Html\Html;
 use MediaWiki\Linker\Linker;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MediaWiki\User\ActorStoreFactory;
@@ -42,7 +43,6 @@ use MediaWiki\User\UserNamePrefixSearch;
 use MediaWiki\User\UserNameUtils;
 use MediaWiki\Watchlist\WatchlistManager;
 use MediaWiki\WikiMap\WikiMap;
-use OutputPage;
 use PermissionsError;
 use SpecialPage;
 use UserBlockedError;

tests/phpunit/includes/OutputPageTest.php

@@ -3,6 +3,7 @@
 use MediaWiki\Html\Html;
 use MediaWiki\Languages\LanguageConverterFactory;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageReferenceValue;
@@ -2016,21 +2017,21 @@ class OutputPageTest extends MediaWikiIntegrationTestCase {
 
 	public function testParseAsContentNullTitle() {
 		$this->expectException( MWException::class );
-		$this->expectExceptionMessage( 'Empty $mTitle in OutputPage::parseInternal' );
+		$this->expectExceptionMessage( 'Empty $mTitle in MediaWiki\Output\OutputPage::parseInternal' );
 		$op = $this->newInstance( [], null, 'notitle' );
 		$op->parseAsContent( '' );
 	}
 
 	public function testParseAsInterfaceNullTitle() {
 		$this->expectException( MWException::class );
-		$this->expectExceptionMessage( 'Empty $mTitle in OutputPage::parseInternal' );
+		$this->expectExceptionMessage( 'Empty $mTitle in MediaWiki\Output\OutputPage::parseInternal' );
 		$op = $this->newInstance( [], null, 'notitle' );
 		$op->parseAsInterface( '' );
 	}
 
 	public function testParseInlineAsInterfaceNullTitle() {
 		$this->expectException( MWException::class );
-		$this->expectExceptionMessage( 'Empty $mTitle in OutputPage::parseInternal' );
+		$this->expectExceptionMessage( 'Empty $mTitle in MediaWiki\Output\OutputPage::parseInternal' );
 		$op = $this->newInstance( [], null, 'notitle' );
 		$op->parseInlineAsInterface( '' );
 	}

tests/phpunit/includes/actions/WatchActionTest.php

@@ -2,6 +2,7 @@
 
 use MediaWiki\Language\RawMessage;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Status\Status;
 use MediaWiki\Tests\Unit\DummyServicesTrait;

tests/phpunit/includes/diff/DifferenceEngineSlotDiffRendererTest.php

@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Output\OutputPage;
+
 /**
  * @covers DifferenceEngineSlotDiffRenderer
  */

tests/phpunit/includes/diff/DifferenceEngineTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\MainConfigNames;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\SimpleAuthority;
 use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RevisionRecord;

tests/phpunit/includes/exception/BadTitleErrorTest.php

@@ -1,4 +1,7 @@
 <?php
+
+use MediaWiki\Output\OutputPage;
+
 /**
  * @covers BadTitleError
  * @author Addshore

tests/phpunit/includes/exception/ErrorPageErrorTest.php

@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Output\OutputPage;
+
 /**
  * @covers ErrorPageError
  * @author Addshore

tests/phpunit/includes/exception/ThrottledErrorTest.php

@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Output\OutputPage;
+
 /**
  * @covers ThrottledError
  * @author Addshore

tests/phpunit/includes/htmlform/HTMLFormTest.php

@@ -2,6 +2,7 @@
 
 use MediaWiki\Language\RawMessage;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;

tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\MainConfigNames;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Request\FauxResponse;
 use MediaWiki\Title\Title;

tests/phpunit/includes/page/ArticleViewTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\MainConfigNames;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RevisionRecord;

tests/phpunit/includes/pager/HistoryPagerTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Title\Title;

tests/phpunit/includes/skins/SkinMustacheTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\MainConfigNames;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Request\ContentSecurityPolicy;
 use MediaWiki\Title\Title;
 use PHPUnit\Framework\MockObject\MockObject;