Namespace ParserOutput

Most used non-namespaced class!

Bug: T353458
Change-Id: I4c2cbb0a808b3881a4d6ca489eee5d8c8ebf26cf

RELEASE-NOTES-1.42

@@ -241,6 +241,8 @@ because of Phabricator reports.
     - TransactionRoundDefiningUpdate
     - UserEditCountInfo
     - UserEditCountUpdate
+  - MediaWiki\Parser:
+    - ParserOutput
   - MediaWiki\Site:
     - CachingSiteStore
     - DBSiteStore

autoload.php

@@ -1683,6 +1683,7 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Parser\\ParserCacheFilter' => __DIR__ . '/includes/parser/ParserCacheFilter.php',
 	'MediaWiki\\Parser\\ParserCacheMetadata' => __DIR__ . '/includes/parser/ParserCacheMetadata.php',
 	'MediaWiki\\Parser\\ParserObserver' => __DIR__ . '/includes/parser/ParserObserver.php',
+	'MediaWiki\\Parser\\ParserOutput' => __DIR__ . '/includes/parser/ParserOutput.php',
 	'MediaWiki\\Parser\\ParserOutputFlags' => __DIR__ . '/includes/parser/ParserOutputFlags.php',
 	'MediaWiki\\Parser\\ParserOutputStringSets' => __DIR__ . '/includes/parser/ParserOutputStringSets.php',
 	'MediaWiki\\Parser\\Parsoid\\Config\\DataAccess' => __DIR__ . '/includes/parser/Parsoid/Config/DataAccess.php',

includes/Category/TrackingCategories.php

@@ -26,10 +26,10 @@ use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageReference;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Title\NamespaceInfo;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleParser;
-use ParserOutput;
 use Psr\Log\LoggerInterface;
 
 /**

includes/Hook/AlternateEditPreviewHook.php

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

includes/Hook/OutputPageParserOutputHook.php

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

includes/HookContainer/HookRunner.php

@@ -13,6 +13,7 @@ use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Mail\UserEmailContact;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\ProperPageIdentity;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\RenameUser\RenameuserSQL;
 use MediaWiki\ResourceLoader as RL;
@@ -3323,7 +3324,7 @@ class HookRunner implements
 	}
 
 	public function onSearchDataForIndex2( array &$fields, \ContentHandler $handler,
-		\WikiPage $page, \ParserOutput $output, \SearchEngine $engine, RevisionRecord $revision
+		\WikiPage $page, ParserOutput $output, \SearchEngine $engine, RevisionRecord $revision
 	) {
 		return $this->container->run(
 			'SearchDataForIndex2',

includes/Output/OutputPage.php

@@ -44,6 +44,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageRecord;
 use MediaWiki\Page\PageReference;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\ParserOutputFlags;
 use MediaWiki\Parser\Sanitizer;
 use MediaWiki\Permissions\PermissionStatus;
@@ -64,7 +65,6 @@ use OOUI\Element;
 use OOUI\Theme;
 use Parser;
 use ParserOptions;
-use ParserOutput;
 use RequestContext;
 use Skin;
 use TextContent;

includes/OutputTransform/ContentDOMTransformStage.php

@@ -2,8 +2,8 @@
 
 namespace Mediawiki\OutputTransform;
 
+use MediaWiki\Parser\ParserOutput;
 use ParserOptions;
-use ParserOutput;
 use Wikimedia\Parsoid\DOM\Document;
 use Wikimedia\Parsoid\Utils\ContentUtils;
 

includes/OutputTransform/ContentTextTransformStage.php

@@ -2,8 +2,8 @@
 
 namespace Mediawiki\OutputTransform;
 
+use MediaWiki\Parser\ParserOutput;
 use ParserOptions;
-use ParserOutput;
 
 /**
  * OutputTransformStages that only modify the content. It is expected that all inheriting classes call this class'

includes/OutputTransform/OutputTransformPipeline.php

@@ -2,8 +2,8 @@
 
 namespace Mediawiki\OutputTransform;
 
+use MediaWiki\Parser\ParserOutput;
 use ParserOptions;
-use ParserOutput;
 
 /**
  * @unstable

includes/OutputTransform/OutputTransformStage.php

@@ -2,8 +2,8 @@
 
 namespace Mediawiki\OutputTransform;
 
+use MediaWiki\Parser\ParserOutput;
 use ParserOptions;
-use ParserOutput;
 
 /**
  * Classes implementing the OutputTransformStage aim at being added to a pipeline of transformations that transform

includes/OutputTransform/Stages/AddRedirectHeader.php

@@ -3,8 +3,8 @@
 namespace Mediawiki\OutputTransform\Stages;
 
 use Mediawiki\OutputTransform\ContentTextTransformStage;
+use MediaWiki\Parser\ParserOutput;
 use ParserOptions;
-use ParserOutput;
 
 /**
  * Adds RedirectHeader if it exists

includes/OutputTransform/Stages/AddWrapperDivClass.php

@@ -6,8 +6,8 @@ use Language;
 use MediaWiki\Html\Html;
 use MediaWiki\Languages\LanguageFactory;
 use Mediawiki\OutputTransform\ContentTextTransformStage;
+use MediaWiki\Parser\ParserOutput;
 use ParserOptions;
-use ParserOutput;
 
 /**
  * Wrap the output in a div with the provided class name

includes/OutputTransform/Stages/DeduplicateStyles.php

@@ -4,9 +4,9 @@ namespace Mediawiki\OutputTransform\Stages;
 
 use MediaWiki\Html\Html;
 use Mediawiki\OutputTransform\ContentTextTransformStage;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\Sanitizer;
 use ParserOptions;
-use ParserOutput;
 
 /**
  * Generates a list of unique style links

includes/OutputTransform/Stages/ExpandToAbsoluteUrls.php

@@ -4,8 +4,8 @@ namespace Mediawiki\OutputTransform\Stages;
 
 use MediaWiki\Linker\Linker;
 use Mediawiki\OutputTransform\ContentTextTransformStage;
+use MediaWiki\Parser\ParserOutput;
 use ParserOptions;
-use ParserOutput;
 
 /**
  * Expand relative links to absolute URLs

includes/OutputTransform/Stages/ExtractBody.php

@@ -4,9 +4,9 @@ namespace Mediawiki\OutputTransform\Stages;
 
 use MediaWiki\Html\HtmlHelper;
 use Mediawiki\OutputTransform\ContentTextTransformStage;
+use MediaWiki\Parser\ParserOutput;
 use Parser;
 use ParserOptions;
-use ParserOutput;
 use Wikimedia\RemexHtml\Serializer\SerializerNode;
 
 /**

includes/OutputTransform/Stages/HandleSectionLinks.php

@@ -3,11 +3,11 @@
 namespace Mediawiki\OutputTransform\Stages;
 
 use Mediawiki\OutputTransform\ContentTextTransformStage;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\Sanitizer;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleFactory;
 use ParserOptions;
-use ParserOutput;
 use Psr\Log\LoggerInterface;
 use RequestContext;
 use Skin;

includes/OutputTransform/Stages/HandleTOCMarkers.php

@@ -5,11 +5,11 @@ namespace Mediawiki\OutputTransform\Stages;
 use Language;
 use MediaWiki\Linker\Linker;
 use Mediawiki\OutputTransform\ContentTextTransformStage;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\Sanitizer;
 use MediaWiki\Tidy\TidyDriverBase;
 use Parser;
 use ParserOptions;
-use ParserOutput;
 use RequestContext;
 
 /**

includes/OutputTransform/Stages/HydrateHeaderPlaceholders.php

@@ -3,8 +3,8 @@
 namespace Mediawiki\OutputTransform\Stages;
 
 use Mediawiki\OutputTransform\ContentTextTransformStage;
+use MediaWiki\Parser\ParserOutput;
 use ParserOptions;
-use ParserOutput;
 
 /**
  * Hydrate slot section header placeholders generated by RevisionRenderer.

includes/OutputTransform/Stages/PostCacheTransformHookRunner.php

@@ -5,8 +5,8 @@ namespace Mediawiki\OutputTransform\Stages;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use Mediawiki\OutputTransform\ContentTextTransformStage;
+use MediaWiki\Parser\ParserOutput;
 use ParserOptions;
-use ParserOutput;
 
 /**
  * @internal

includes/OutputTransform/Stages/RenderDebugInfo.php

@@ -6,9 +6,9 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Language\RawMessage;
 use Mediawiki\OutputTransform\ContentTextTransformStage;
+use MediaWiki\Parser\ParserOutput;
 use Message;
 use ParserOptions;
-use ParserOutput;
 
 /**
  * Adds debug info to the output

includes/Rest/Handler/Helper/HtmlInputTransformHelper.php

@@ -27,6 +27,7 @@ use MediaWiki\Edit\ParsoidOutputStash;
 use MediaWiki\Edit\SelserContext;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageIdentity;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\Parsoid\HtmlToContentTransform;
 use MediaWiki\Parser\Parsoid\HtmlTransformFactory;
 use MediaWiki\Parser\Parsoid\PageBundleParserOutputConverter;
@@ -41,7 +42,6 @@ use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Status\Status;
 use MWUnknownContentModelException;
 use ParserOptions;
-use ParserOutput;
 use Wikimedia\Bcp47Code\Bcp47Code;
 use Wikimedia\Message\MessageValue;
 use Wikimedia\ParamValidator\ParamValidator;

includes/Rest/Handler/Helper/HtmlMessageOutputHelper.php

@@ -21,10 +21,10 @@ namespace MediaWiki\Rest\Handler\Helper;
 
 use LanguageCode;
 use MediaWiki\Page\PageIdentity;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Rest\ResponseInterface;
 use MediaWiki\Title\Title;
 use Message;
-use ParserOutput;
 use Wikimedia\Parsoid\Utils\ContentUtils;
 use Wikimedia\Parsoid\Utils\DOMUtils;
 

includes/Rest/Handler/Helper/HtmlOutputHelper.php

@@ -19,9 +19,9 @@
  */
 namespace MediaWiki\Rest\Handler\Helper;
 
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Rest\LocalizedHttpException;
 use MediaWiki\Rest\ResponseInterface;
-use ParserOutput;
 use Wikimedia\Bcp47Code\Bcp47Code;
 use Wikimedia\Parsoid\Core\ClientError;
 

includes/Rest/Handler/Helper/HtmlOutputRendererHelper.php

@@ -32,6 +32,7 @@ use MediaWiki\Languages\LanguageFactory;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\ParserOutputAccess;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\Parsoid\HtmlTransformFactory;
 use MediaWiki\Parser\Parsoid\PageBundleParserOutputConverter;
 use MediaWiki\Parser\Parsoid\ParsoidOutputAccess;
@@ -49,7 +50,6 @@ use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
 use MWUnknownContentModelException;
 use ParserOptions;
-use ParserOutput;
 use Wikimedia\Assert\Assert;
 use Wikimedia\Bcp47Code\Bcp47Code;
 use Wikimedia\Bcp47Code\Bcp47CodeValue;

includes/Revision/RenderedRevision.php

@@ -27,10 +27,10 @@ use InvalidArgumentException;
 use LogicException;
 use MediaWiki\Content\Renderer\ContentRenderer;
 use MediaWiki\Page\PageReference;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\ParserOutputFlags;
 use MediaWiki\Permissions\Authority;
 use ParserOptions;
-use ParserOutput;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Wikimedia\Assert\Assert;

includes/Revision/RevisionRenderer.php

@@ -25,9 +25,9 @@ namespace MediaWiki\Revision;
 use InvalidArgumentException;
 use MediaWiki\Content\Renderer\ContentRenderer;
 use MediaWiki\Html\Html;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Permissions\Authority;
 use ParserOptions;
-use ParserOutput;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Wikimedia\Rdbms\ILoadBalancer;

includes/Revision/SlotRenderingProvider.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Revision;
 
-use ParserOutput;
+use MediaWiki\Parser\ParserOutput;
 
 /**
  * A lazy provider of ParserOutput objects for a revision's individual slots.

includes/Status/StatusFormatter.php

@@ -24,12 +24,12 @@ use ApiMessage;
 use ApiRawMessage;
 use Language;
 use MediaWiki\Language\RawMessage;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\StubObject\StubUserLang;
 use Message;
 use MessageCache;
 use MessageLocalizer;
 use MessageSpecifier;
-use ParserOutput;
 use StatusValue;
 use UnexpectedValueException;
 

includes/Storage/DerivedPageDataUpdater.php

@@ -42,6 +42,7 @@ use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\ParserOutputAccess;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\ResourceLoader as RL;
 use MediaWiki\Revision\MutableRevisionRecord;
@@ -62,7 +63,6 @@ use MessageCache;
 use MWUnknownContentModelException;
 use ParserCache;
 use ParserOptions;
-use ParserOutput;
 use ParsoidCachePrewarmJob;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;

includes/Storage/Hook/ParserOutputStashForEditHook.php

@@ -3,8 +3,8 @@
 namespace MediaWiki\Storage\Hook;
 
 use Content;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\User\User;
-use ParserOutput;
 use WikiPage;
 
 /**

includes/Storage/PageEditStash.php

@@ -27,13 +27,13 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\WikiPageFactory;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\ParserOutputFlags;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Storage\Hook\ParserOutputStashForEditHook;
 use MediaWiki\User\UserEditTracker;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;
-use ParserOutput;
 use Psr\Log\LoggerInterface;
 use stdClass;
 use Wikimedia\Rdbms\IConnectionProvider;

includes/Storage/PreparedUpdate.php

@@ -3,9 +3,9 @@ namespace MediaWiki\Storage;
 
 use Content;
 use MediaWiki\Page\PageIdentity;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Revision\RenderedRevision;
 use MediaWiki\Revision\RevisionRecord;
-use ParserOutput;
 
 /**
  * An object representing a page update during an edit.

includes/actions/InfoAction.php

@@ -36,6 +36,7 @@ use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageProps;
 use MediaWiki\Page\RedirectLookup;
 use MediaWiki\Parser\MagicWordFactory;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\Sanitizer;
 use MediaWiki\Permissions\RestrictionStore;
 use MediaWiki\Revision\RevisionLookup;

includes/api/ApiParse.php

@@ -31,6 +31,7 @@ use MediaWiki\Languages\LanguageNameUtils;
 use MediaWiki\Output\OutputPage;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\WikiPageFactory;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\ParserOutputFlags;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Revision\RevisionLookup;

includes/content/ContentHandler.php

@@ -39,6 +39,7 @@ use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\ParserOutputAccess;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Revision\SlotRenderingProvider;

includes/content/CssContentHandler.php

@@ -26,6 +26,7 @@ use MediaWiki\Content\Transform\PreSaveTransformParams;
 use MediaWiki\Html\Html;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Title\Title;
 use Wikimedia\Minify\CSSMin;
 

includes/content/FallbackContentHandler.php

@@ -25,6 +25,7 @@
 
 use MediaWiki\Content\Renderer\ContentParseParams;
 use MediaWiki\Html\Html;
+use MediaWiki\Parser\ParserOutput;
 
 /**
  * Content handler implementation for unknown content.

includes/content/FileContentHandler.php

@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Revision\RevisionRecord;
 
 /**

includes/content/Hook/ContentAlterParserOutputHook.php

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

includes/content/Hook/ContentGetParserOutputHook.php

@@ -3,9 +3,9 @@
 namespace MediaWiki\Content\Hook;
 
 use Content;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Title\Title;
 use ParserOptions;
-use ParserOutput;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/content/Hook/SearchDataForIndex2Hook.php

@@ -3,8 +3,8 @@
 namespace MediaWiki\Content\Hook;
 
 use ContentHandler;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Revision\RevisionRecord;
-use ParserOutput;
 use SearchEngine;
 use WikiPage;
 

includes/content/Hook/SearchDataForIndexHook.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Content\Hook;
 
 use ContentHandler;
-use ParserOutput;
+use MediaWiki\Parser\ParserOutput;
 use SearchEngine;
 use WikiPage;
 

includes/content/JavaScriptContentHandler.php

@@ -23,6 +23,7 @@ use MediaWiki\Content\Transform\PreSaveTransformParams;
 use MediaWiki\Html\Html;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Title\Title;
 
 /**

includes/content/JsonContentHandler.php

@@ -21,6 +21,7 @@
 use MediaWiki\Content\Renderer\ContentParseParams;
 use MediaWiki\Content\Transform\PreSaveTransformParams;
 use MediaWiki\Content\ValidationParams;
+use MediaWiki\Parser\ParserOutput;
 
 /**
  * Content handler for JSON text.

includes/content/Renderer/ContentRenderer.php

@@ -4,8 +4,8 @@ namespace MediaWiki\Content\Renderer;
 use Content;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Page\PageReference;
+use MediaWiki\Parser\ParserOutput;
 use ParserOptions;
-use ParserOutput;
 
 /**
  * A service to render content.

includes/content/TextContentHandler.php

@@ -27,6 +27,7 @@ use MediaWiki\Content\Renderer\ContentParseParams;
 use MediaWiki\Content\Transform\PreSaveTransformParams;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Revision\RevisionRecord;
 
 /**

includes/content/WikiTextStructure.php

@@ -1,6 +1,7 @@
 <?php
 
 use HtmlFormatter\HtmlFormatter;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\Sanitizer;
 
 /**

includes/content/WikitextContentHandler.php

@@ -29,6 +29,7 @@ use MediaWiki\Content\Transform\PreSaveTransformParams;
 use MediaWiki\Languages\LanguageNameUtils;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Parser\MagicWordFactory;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\ParserOutputFlags;
 use MediaWiki\Parser\Parsoid\ParsoidParserFactory;
 use MediaWiki\Revision\RevisionRecord;

includes/deferred/LinksUpdate/CategoryLinksTable.php

@@ -7,9 +7,9 @@ use MediaWiki\DAO\WikiAwareEntity;
 use MediaWiki\Languages\LanguageConverterFactory;
 use MediaWiki\Page\PageReferenceValue;
 use MediaWiki\Page\WikiPageFactory;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Title\NamespaceInfo;
 use MediaWiki\Title\Title;
-use ParserOutput;
 use PurgeJobUtils;
 
 /**

includes/deferred/LinksUpdate/ExternalLinksTable.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Deferred\LinksUpdate;
 
 use MediaWiki\ExternalLinks\LinkFilter;
-use ParserOutput;
+use MediaWiki\Parser\ParserOutput;
 
 /**
  * externallinks

includes/deferred/LinksUpdate/ImageLinksTable.php

@@ -4,8 +4,8 @@ namespace MediaWiki\Deferred\LinksUpdate;
 
 use MediaWiki\DAO\WikiAwareEntity;
 use MediaWiki\Page\PageReferenceValue;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Title\Title;
-use ParserOutput;
 use PurgeJobUtils;
 
 /**

includes/deferred/LinksUpdate/InterwikiLinksTable.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Deferred\LinksUpdate;
 
-use ParserOutput;
+use MediaWiki\Parser\ParserOutput;
 
 /**
  * iwlinks

includes/deferred/LinksUpdate/LangLinksTable.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Deferred\LinksUpdate;
 
-use ParserOutput;
+use MediaWiki\Parser\ParserOutput;
 
 /**
  * langlinks

includes/deferred/LinksUpdate/LinksDeletionUpdate.php

@@ -29,8 +29,8 @@ use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Deferred\EnqueueableDataUpdate;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Parser\ParserOutput;
 use MWException;
-use ParserOutput;
 use WikiPage;
 
 /**

includes/deferred/LinksUpdate/LinksTable.php

@@ -5,8 +5,8 @@ namespace MediaWiki\Deferred\LinksUpdate;
 use MediaWiki\Linker\LinkTargetLookup;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageReference;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Revision\RevisionRecord;
-use ParserOutput;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IResultWrapper;
 use Wikimedia\Rdbms\LBFactory;

includes/deferred/LinksUpdate/LinksTableGroup.php

@@ -8,8 +8,8 @@ use MediaWiki\Linker\LinkTargetLookup;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageReference;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Revision\RevisionRecord;
-use ParserOutput;
 use Wikimedia\ObjectFactory\ObjectFactory;
 use Wikimedia\Rdbms\LBFactory;
 

includes/deferred/LinksUpdate/LinksUpdate.php

@@ -34,11 +34,11 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageReferenceValue;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
 use MWException;
-use ParserOutput;
 use RefreshLinksJob;
 use RuntimeException;
 use Wikimedia\Rdbms\IDatabase;

includes/deferred/LinksUpdate/PageLinksTable.php

@@ -5,7 +5,7 @@ namespace MediaWiki\Deferred\LinksUpdate;
 use MediaWiki\Config\Config;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\MainConfigNames;
-use ParserOutput;
+use MediaWiki\Parser\ParserOutput;
 
 /**
  * pagelinks

includes/deferred/LinksUpdate/PagePropsTable.php

@@ -6,7 +6,7 @@ use HTMLCacheUpdateJob;
 use JobQueueGroup;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\MainConfigNames;
-use ParserOutput;
+use MediaWiki\Parser\ParserOutput;
 
 /**
  * page_props

includes/deferred/LinksUpdate/TemplateLinksTable.php

@@ -5,7 +5,7 @@ namespace MediaWiki\Deferred\LinksUpdate;
 use MediaWiki\Config\Config;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\MainConfigNames;
-use ParserOutput;
+use MediaWiki\Parser\ParserOutput;
 
 /**
  * templatelinks

includes/diff/Hook/DifferenceEngineRenderRevisionAddParserOutputHook.php

@@ -4,7 +4,7 @@ namespace MediaWiki\Diff\Hook;
 
 use DifferenceEngine;
 use MediaWiki\Output\OutputPage;
-use ParserOutput;
+use MediaWiki\Parser\ParserOutput;
 use WikiPage;
 
 /**

includes/edit/PreparedEdit.php

@@ -21,8 +21,8 @@
 namespace MediaWiki\Edit;
 
 use Content;
+use MediaWiki\Parser\ParserOutput;
 use ParserOptions;
-use ParserOutput;
 use RuntimeException;
 
 /**

includes/editpage/EditPage.php

@@ -67,6 +67,7 @@ use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\RedirectLookup;
 use MediaWiki\Page\WikiPageFactory;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Permissions\RestrictionStore;
@@ -99,7 +100,6 @@ use OOUI\CheckboxInputWidget;
 use OOUI\DropdownInputWidget;
 use OOUI\FieldLayout;
 use ParserOptions;
-use ParserOutput;
 use PermissionsError;
 use ReadOnlyError;
 use RecentChange;

includes/jobqueue/jobs/RefreshLinksJob.php

@@ -25,6 +25,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageAssertionException;
 use MediaWiki\Page\PageIdentity;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\RevisionRenderer;
 use MediaWiki\Title\Title;

includes/language/Message.php

@@ -26,6 +26,7 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Message\UserGroupMembershipParam;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageReferenceValue;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\StubObject\StubUserLang;
 use MediaWiki\Title\Title;
 use Wikimedia\Assert\Assert;

includes/language/MessageCache.php

@@ -33,6 +33,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageReferenceValue;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\StubObject\StubObject;
 use MediaWiki\StubObject\StubUserLang;

includes/page/Article.php

@@ -33,6 +33,7 @@ use MediaWiki\Output\OutputPage;
 use MediaWiki\Page\ParserOutputAccess;
 use MediaWiki\Page\ProtectionForm;
 use MediaWiki\Page\WikiPageFactory;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Permissions\PermissionStatus;
 use MediaWiki\Revision\ArchivedRevisionLookup;

includes/page/Hook/ArticleViewHeaderHook.php

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

includes/page/Hook/OpportunisticLinksUpdateHook.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Page\Hook;
 
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Title\Title;
-use ParserOutput;
 use WikiPage;
 
 /**

includes/page/ParserOutputAccess.php

@@ -24,6 +24,7 @@ use InvalidArgumentException;
 use MapCacheLRU;
 use MediaWiki\Logger\Spi as LoggerSpi;
 use MediaWiki\Parser\ParserCacheFactory;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\RevisionOutputCache;
 use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Revision\RevisionRecord;
@@ -32,7 +33,6 @@ use MediaWiki\Status\Status;
 use MediaWiki\Title\TitleFormatter;
 use ParserCache;
 use ParserOptions;
-use ParserOutput;
 use PoolCounterWork;
 use PoolWorkArticleView;
 use PoolWorkArticleViewCurrent;

includes/page/WikiPage.php

@@ -35,6 +35,7 @@ use MediaWiki\Page\PageRecord;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageStoreRecord;
 use MediaWiki\Page\ParserOutputAccess;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\RevisionStore;

includes/pager/TablePager.php

@@ -23,7 +23,7 @@ namespace MediaWiki\Pager;
 use IContextSource;
 use MediaWiki\Html\Html;
 use MediaWiki\Linker\LinkRenderer;
-use ParserOutput;
+use MediaWiki\Parser\ParserOutput;
 use stdClass;
 use XmlSelect;
 

includes/parser/Hook/ParserCacheSaveCompleteHook.php

@@ -2,10 +2,10 @@
 
 namespace MediaWiki\Hook;
 
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Title\Title;
 use ParserCache;
 use ParserOptions;
-use ParserOutput;
 
 /**
  * This is a hook handler interface, see docs/Hooks.md.

includes/parser/Hook/ParserLimitReportPrepareHook.php

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

includes/parser/Hook/ParserOutputPostCacheTransformHook.php

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

includes/parser/Hook/RejectParserCacheValueHook.php

@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Hook;
 
+use MediaWiki\Parser\ParserOutput;
 use ParserOptions;
-use ParserOutput;
 use WikiPage;
 
 /**

includes/parser/Parser.php

@@ -42,6 +42,7 @@ use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Parser\MagicWordArray;
 use MediaWiki\Parser\MagicWordFactory;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\ParserOutputFlags;
 use MediaWiki\Parser\Sanitizer;
 use MediaWiki\Preferences\SignatureValidatorFactory;

includes/parser/ParserCache.php

@@ -28,6 +28,7 @@ use MediaWiki\Page\PageRecord;
 use MediaWiki\Page\WikiPageFactory;
 use MediaWiki\Parser\ParserCacheFilter;
 use MediaWiki\Parser\ParserCacheMetadata;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Title\TitleFactory;
 use Psr\Log\LoggerInterface;
 

includes/parser/ParserCacheFilter.php

@@ -23,7 +23,6 @@ namespace MediaWiki\Parser;
 
 use MediaWiki\Page\PageRecord;
 use ParserOptions;
-use ParserOutput;
 
 /**
  * Filter that decides whether a ParserOutput object should be stored in the

includes/parser/ParserObserver.php

@@ -33,7 +33,6 @@ use MediaWiki\Cache\CacheKeyHelper;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Title\Title;
 use ParserOptions;
-use ParserOutput;
 use Psr\Log\LoggerInterface;
 use RuntimeException;
 

includes/parser/ParserOutput.php

@@ -18,16 +18,23 @@
  * @file
  */
 
+namespace MediaWiki\Parser;
+
+use CacheTime;
+use InvalidArgumentException;
+use LogicException;
 use MediaWiki\Json\JsonUnserializable;
 use MediaWiki\Json\JsonUnserializableTrait;
 use MediaWiki\Json\JsonUnserializer;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Output\OutputPage;
-use MediaWiki\Parser\ParserOutputFlags;
-use MediaWiki\Parser\ParserOutputStringSets;
 use MediaWiki\Parser\Parsoid\PageBundleParserOutputConverter;
 use MediaWiki\Parser\Parsoid\ParsoidRenderID;
+use MediaWiki\Title\Title;
+use MWException;
+use Parser;
+use UnexpectedValueException;
 use Wikimedia\Bcp47Code\Bcp47Code;
 use Wikimedia\Bcp47Code\Bcp47CodeValue;
 use Wikimedia\Parsoid\Core\ContentMetadataCollector;
@@ -2731,3 +2738,8 @@ class ParserOutput extends CacheTime implements ContentMetadataCollector {
 		}
 	}
 }
+
+/**
+ * @deprecated since 1.42
+ */
+class_alias( ParserOutput::class, 'ParserOutput' );

includes/parser/ParserOutputFlags.php

@@ -44,50 +44,50 @@ class ParserOutputFlags {
 
 	/**
 	 * @var string No gallery on category page? (__NOGALLERY__).
-	 * @see \ParserOutput::getNoGallery()
-	 * @see \ParserOutput::setNoGallery()
+	 * @see ParserOutput::getNoGallery()
+	 * @see ParserOutput::setNoGallery()
 	 */
 	public const NO_GALLERY = 'mw-NoGallery';
 
 	/**
 	 * @var string Whether OOUI should be enabled.
-	 * @see \ParserOutput::getEnableOOUI()
-	 * @see \ParserOutput::setEnableOOUI()
+	 * @see ParserOutput::getEnableOOUI()
+	 * @see ParserOutput::setEnableOOUI()
 	 */
 	public const ENABLE_OOUI = 'mw-EnableOOUI';
 
 	/**
 	 * @var string Force index policy to be 'index'
-	 * @see \ParserOutput::getIndexPolicy()
-	 * @see \ParserOutput::setIndexPolicy()
+	 * @see ParserOutput::getIndexPolicy()
+	 * @see ParserOutput::setIndexPolicy()
 	 */
 	public const INDEX_POLICY = 'mw-IndexPolicy';
 
 	/**
 	 * @var string Force index policy to be 'noindex'
-	 * @see \ParserOutput::getIndexPolicy()
-	 * @see \ParserOutput::setIndexPolicy()
+	 * @see ParserOutput::getIndexPolicy()
+	 * @see ParserOutput::setIndexPolicy()
 	 */
 	public const NO_INDEX_POLICY = 'mw-NoIndexPolicy';
 
 	/**
 	 * @var string Show a new section link?
-	 * @see \ParserOutput::getNewSection()
-	 * @see \ParserOutput::setNewSection()
+	 * @see ParserOutput::getNewSection()
+	 * @see ParserOutput::setNewSection()
 	 */
 	public const NEW_SECTION = 'mw-NewSection';
 
 	/**
 	 * @var string Hide the new section link?
-	 * @see \ParserOutput::getHideNewSection()
-	 * @see \ParserOutput::setHideNewSection()
+	 * @see ParserOutput::getHideNewSection()
+	 * @see ParserOutput::setHideNewSection()
 	 */
 	public const HIDE_NEW_SECTION = 'mw-HideNewSection';
 
 	/**
 	 * @var string The prevent-clickjacking flag
-	 * @see \ParserOutput::getPreventClickjacking()
-	 * @see \ParserOutput::setPreventClickjacking()
+	 * @see ParserOutput::getPreventClickjacking()
+	 * @see ParserOutput::setPreventClickjacking()
 	 */
 	public const PREVENT_CLICKJACKING = 'mw-PreventClickjacking';
 

includes/parser/ParserOutputStringSets.php

@@ -42,40 +42,40 @@ class ParserOutputStringSets {
 	/**
 	 * @var string ResourceLoader modules to load.
 	 * @see \MediaWiki\Output\OutputPage::addModules
-	 * @see \ParserOutput::addModules
-	 * @see \ParserOutput::getModules
+	 * @see ParserOutput::addModules
+	 * @see ParserOutput::getModules
 	 */
 	public const MODULE = 'mw-Module';
 
 	/**
 	 * @var string Style-only ResourceLoader modules to load.
 	 * @see \MediaWiki\Output\OutputPage::addModuleStyles
-	 * @see \ParserOutput::addModuleStyles
-	 * @see \ParserOutput::getModuleStyles
+	 * @see ParserOutput::addModuleStyles
+	 * @see ParserOutput::getModuleStyles
 	 */
 	public const MODULE_STYLE = 'mw-ModuleStyle';
 
 	/**
 	 * @var string Extra values for the Content-Security-Policy default-src
 	 *  directive.
-	 * @see \ParserOutput::addExtraCSPDefaultSrc
-	 * @see \ParserOutput::getExtraCSPDefaultSrcs
+	 * @see ParserOutput::addExtraCSPDefaultSrc
+	 * @see ParserOutput::getExtraCSPDefaultSrcs
 	 */
 	public const EXTRA_CSP_DEFAULT_SRC = 'mw-ExtraCSPDefaultSrc';
 
 	/**
 	 * @var string Extra values for the Content-Security-Policy script-src
 	 *  directive.
-	 * @see \ParserOutput::addExtraCSPScriptSrc
-	 * @see \ParserOutput::getExtraCSPScriptSrcs
+	 * @see ParserOutput::addExtraCSPScriptSrc
+	 * @see ParserOutput::getExtraCSPScriptSrcs
 	 */
 	public const EXTRA_CSP_SCRIPT_SRC = 'mw-ExtraCspScriptSrc';
 
 	/**
 	 * @var string Extra values for the Content-Security-Policy style-src
 	 *  directive.
-	 * @see \ParserOutput::addExtraCSPStyleSrc
-	 * @see \ParserOutput::getExtraCSPStyleSrcs
+	 * @see ParserOutput::addExtraCSPStyleSrc
+	 * @see ParserOutput::getExtraCSPStyleSrcs
 	 */
 	public const EXTRA_CSP_STYLE_SRC = 'mw-ExtraCspStyleSrc';
 

includes/parser/Parsoid/Config/SiteConfig.php

@@ -36,6 +36,7 @@ use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Parser\MagicWordArray;
 use MediaWiki\Parser\MagicWordFactory;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\SpecialPage\SpecialPageFactory;
 use MediaWiki\Title\NamespaceInfo;
 use MediaWiki\Title\Title;
@@ -44,7 +45,6 @@ use MediaWiki\Utils\UrlUtils;
 use MediaWiki\WikiMap\WikiMap;
 use MWException;
 use ParserFactory;
-use ParserOutput;
 use PrefixingStatsdDataFactoryProxy;
 use Psr\Log\LoggerInterface;
 use UnexpectedValueException;

includes/parser/Parsoid/LanguageVariantConverter.php

@@ -6,12 +6,12 @@ use LanguageCode;
 use MediaWiki\Languages\LanguageConverterFactory;
 use MediaWiki\Languages\LanguageFactory;
 use MediaWiki\Page\PageIdentity;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\Parsoid\Config\PageConfigFactory;
 use MediaWiki\Rest\HttpException;
 use MediaWiki\Revision\RevisionAccessException;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleFactory;
-use ParserOutput;
 use Wikimedia\Bcp47Code\Bcp47Code;
 use Wikimedia\Bcp47Code\Bcp47CodeValue;
 use Wikimedia\Parsoid\Config\PageConfig;

includes/parser/Parsoid/PageBundleParserOutputConverter.php

@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Parser\Parsoid;
 
-use ParserOutput;
+use MediaWiki\Parser\ParserOutput;
 use Wikimedia\Parsoid\Core\PageBundle;
 
 /**

includes/parser/Parsoid/ParsoidOutputAccess.php

@@ -27,6 +27,7 @@ use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageLookup;
 use MediaWiki\Page\PageRecord;
 use MediaWiki\Page\ParserOutputAccess;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Revision\RevisionAccessException;
 use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Revision\RevisionRecord;
@@ -34,7 +35,6 @@ use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Status\Status;
 use MWUnknownContentModelException;
 use ParserOptions;
-use ParserOutput;
 use Wikimedia\Parsoid\Config\SiteConfig;
 use Wikimedia\Parsoid\Core\ClientError;
 use Wikimedia\Parsoid\Core\ResourceLimitExceededException;

includes/parser/Parsoid/ParsoidParser.php

@@ -5,6 +5,7 @@ namespace MediaWiki\Parser\Parsoid;
 use MediaWiki\Languages\LanguageConverterFactory;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageReference;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\Parsoid\Config\PageConfigFactory;
 use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RevisionRecord;
@@ -12,7 +13,6 @@ use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Title\Title;
 use ParserFactory;
 use ParserOptions;
-use ParserOutput;
 use Wikimedia\Assert\Assert;
 use Wikimedia\Parsoid\Config\PageConfig;
 use Wikimedia\Parsoid\Parsoid;

includes/parser/RevisionOutputCache.php

@@ -30,7 +30,6 @@ use MediaWiki\Json\JsonCodec;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Utils\MWTimestamp;
 use ParserOptions;
-use ParserOutput;
 use Psr\Log\LoggerInterface;
 use WANObjectCache;
 

includes/poolcounter/PoolWorkArticleViewCurrent.php

@@ -21,6 +21,7 @@
 use MediaWiki\Logger\Spi as LoggerSpi;
 use MediaWiki\Page\PageRecord;
 use MediaWiki\Page\WikiPageFactory;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\RevisionRenderer;
 use MediaWiki\Status\Status;

includes/poolcounter/PoolWorkArticleViewOld.php

@@ -19,6 +19,7 @@
  */
 
 use MediaWiki\Logger\Spi as LoggerSpi;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\RevisionOutputCache;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\RevisionRenderer;

includes/search/ParserOutputSearchDataExtractor.php

@@ -3,8 +3,8 @@
 namespace MediaWiki\Search;
 
 use MediaWiki\Category\Category;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Title\Title;
-use ParserOutput;
 
 /**
  * Extracts data from ParserOutput for indexing in the search engine.

includes/specials/SpecialEditWatchlist.php

@@ -41,6 +41,7 @@ use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\WikiPageFactory;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\ParserOutputFlags;
 use MediaWiki\Request\WebRequest;
 use MediaWiki\SpecialPage\SpecialPage;
@@ -54,7 +55,6 @@ use MediaWiki\Title\TitleValue;
 use MediaWiki\Watchlist\WatchlistManager;
 use OOUIHTMLForm;
 use Parser;
-use ParserOutput;
 use UserNotLoggedIn;
 use WatchedItemStore;
 use WatchedItemStoreInterface;

includes/specials/SpecialExpandTemplates.php

@@ -27,6 +27,7 @@ use HTMLForm;
 use MediaWiki\Html\Html;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Output\OutputPage;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Status\Status;
 use MediaWiki\Tidy\TidyDriverBase;
@@ -35,7 +36,6 @@ use MediaWiki\User\Options\UserOptionsLookup;
 use Parser;
 use ParserFactory;
 use ParserOptions;
-use ParserOutput;
 use Xml;
 
 /**

includes/specials/SpecialSpecialPages.php

@@ -25,10 +25,10 @@ namespace MediaWiki\Specials;
 
 use MediaWiki\Html\Html;
 use MediaWiki\Language\RawMessage;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\ParserOutputFlags;
 use MediaWiki\SpecialPage\UnlistedSpecialPage;
 use Parser;
-use ParserOutput;
 use Wikimedia\Parsoid\Core\SectionMetadata;
 use Wikimedia\Parsoid\Core\TOCData;
 

includes/specials/SpecialVersion.php

@@ -34,6 +34,7 @@ use MediaWiki\Language\RawMessage;
 use MediaWiki\Linker\Linker;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Parser\ParserOutputFlags;
 use MediaWiki\Parser\Sanitizer;
 use MediaWiki\SpecialPage\SpecialPage;
@@ -45,7 +46,6 @@ use Message;
 use ObjectCache;
 use Parser;
 use ParserFactory;
-use ParserOutput;
 use Symfony\Component\Yaml\Yaml;
 use Wikimedia\Parsoid\Core\SectionMetadata;
 use Wikimedia\Parsoid\Core\TOCData;

maintenance/compareLanguageConverterOutput.php

@@ -19,6 +19,7 @@
  * @ingroup Maintenance
  */
 
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Rest\Handler\Helper\HtmlOutputRendererHelper;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Title\Title;

maintenance/parse.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\Title\Title;
 
 /**

tests/parser/ParserTestMockParser.php

@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Page\PageReference;
+use MediaWiki\Parser\ParserOutput;
 use MediaWiki\User\UserIdentity;
 
 /**