From 9bfb75ff90d82e743acab2cae8dd7b1ec10c2bfc Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Thu, 14 Dec 2023 14:20:33 -0500 Subject: [PATCH] Namespace ParserOutput Most used non-namespaced class! Bug: T353458 Change-Id: I4c2cbb0a808b3881a4d6ca489eee5d8c8ebf26cf --- RELEASE-NOTES-1.42 | 2 ++ autoload.php | 1 + includes/Category/TrackingCategories.php | 2 +- includes/Hook/AlternateEditPreviewHook.php | 2 +- includes/Hook/OutputPageParserOutputHook.php | 2 +- includes/HookContainer/HookRunner.php | 3 +- includes/Output/OutputPage.php | 2 +- .../ContentDOMTransformStage.php | 2 +- .../ContentTextTransformStage.php | 2 +- .../OutputTransformPipeline.php | 2 +- .../OutputTransform/OutputTransformStage.php | 2 +- .../Stages/AddRedirectHeader.php | 2 +- .../Stages/AddWrapperDivClass.php | 2 +- .../Stages/DeduplicateStyles.php | 2 +- .../Stages/ExpandToAbsoluteUrls.php | 2 +- .../OutputTransform/Stages/ExtractBody.php | 2 +- .../Stages/HandleSectionLinks.php | 2 +- .../Stages/HandleTOCMarkers.php | 2 +- .../Stages/HydrateHeaderPlaceholders.php | 2 +- .../Stages/PostCacheTransformHookRunner.php | 2 +- .../Stages/RenderDebugInfo.php | 2 +- .../Helper/HtmlInputTransformHelper.php | 2 +- .../Helper/HtmlMessageOutputHelper.php | 2 +- .../Rest/Handler/Helper/HtmlOutputHelper.php | 2 +- .../Helper/HtmlOutputRendererHelper.php | 2 +- includes/Revision/RenderedRevision.php | 2 +- includes/Revision/RevisionRenderer.php | 2 +- includes/Revision/SlotRenderingProvider.php | 2 +- includes/Status/StatusFormatter.php | 2 +- includes/Storage/DerivedPageDataUpdater.php | 2 +- .../Hook/ParserOutputStashForEditHook.php | 2 +- includes/Storage/PageEditStash.php | 2 +- includes/Storage/PreparedUpdate.php | 2 +- includes/actions/InfoAction.php | 1 + includes/api/ApiParse.php | 1 + includes/content/ContentHandler.php | 1 + includes/content/CssContentHandler.php | 1 + includes/content/FallbackContentHandler.php | 1 + includes/content/FileContentHandler.php | 1 + .../Hook/ContentAlterParserOutputHook.php | 2 +- .../Hook/ContentGetParserOutputHook.php | 2 +- .../content/Hook/SearchDataForIndex2Hook.php | 2 +- .../content/Hook/SearchDataForIndexHook.php | 2 +- includes/content/JavaScriptContentHandler.php | 1 + includes/content/JsonContentHandler.php | 1 + includes/content/Renderer/ContentRenderer.php | 2 +- includes/content/TextContentHandler.php | 1 + includes/content/WikiTextStructure.php | 1 + includes/content/WikitextContentHandler.php | 1 + .../LinksUpdate/CategoryLinksTable.php | 2 +- .../LinksUpdate/ExternalLinksTable.php | 2 +- .../deferred/LinksUpdate/ImageLinksTable.php | 2 +- .../LinksUpdate/InterwikiLinksTable.php | 2 +- .../deferred/LinksUpdate/LangLinksTable.php | 2 +- .../LinksUpdate/LinksDeletionUpdate.php | 2 +- includes/deferred/LinksUpdate/LinksTable.php | 2 +- .../deferred/LinksUpdate/LinksTableGroup.php | 2 +- includes/deferred/LinksUpdate/LinksUpdate.php | 2 +- .../deferred/LinksUpdate/PageLinksTable.php | 2 +- .../deferred/LinksUpdate/PagePropsTable.php | 2 +- .../LinksUpdate/TemplateLinksTable.php | 2 +- ...ngineRenderRevisionAddParserOutputHook.php | 2 +- includes/edit/PreparedEdit.php | 2 +- includes/editpage/EditPage.php | 2 +- includes/jobqueue/jobs/RefreshLinksJob.php | 1 + includes/language/Message.php | 1 + includes/language/MessageCache.php | 1 + includes/page/Article.php | 1 + includes/page/Hook/ArticleViewHeaderHook.php | 2 +- .../Hook/OpportunisticLinksUpdateHook.php | 2 +- includes/page/ParserOutputAccess.php | 2 +- includes/page/WikiPage.php | 1 + includes/pager/TablePager.php | 2 +- .../Hook/ParserCacheSaveCompleteHook.php | 2 +- .../Hook/ParserLimitReportPrepareHook.php | 2 +- .../ParserOutputPostCacheTransformHook.php | 2 +- .../Hook/RejectParserCacheValueHook.php | 2 +- includes/parser/Parser.php | 1 + includes/parser/ParserCache.php | 1 + includes/parser/ParserCacheFilter.php | 1 - includes/parser/ParserObserver.php | 1 - includes/parser/ParserOutput.php | 16 +++++++++-- includes/parser/ParserOutputFlags.php | 28 +++++++++---------- includes/parser/ParserOutputStringSets.php | 20 ++++++------- includes/parser/Parsoid/Config/SiteConfig.php | 2 +- .../Parsoid/LanguageVariantConverter.php | 2 +- .../PageBundleParserOutputConverter.php | 2 +- .../parser/Parsoid/ParsoidOutputAccess.php | 2 +- includes/parser/Parsoid/ParsoidParser.php | 2 +- includes/parser/RevisionOutputCache.php | 1 - .../PoolWorkArticleViewCurrent.php | 1 + .../poolcounter/PoolWorkArticleViewOld.php | 1 + .../ParserOutputSearchDataExtractor.php | 2 +- includes/specials/SpecialEditWatchlist.php | 2 +- includes/specials/SpecialExpandTemplates.php | 2 +- includes/specials/SpecialSpecialPages.php | 2 +- includes/specials/SpecialVersion.php | 2 +- .../compareLanguageConverterOutput.php | 1 + maintenance/parse.php | 1 + tests/parser/ParserTestMockParser.php | 1 + tests/parser/ParserTestRunner.php | 1 + .../DefaultOutputPipelineFactoryTest.php | 2 +- .../Stages/AddRedirectHeaderTest.php | 2 +- .../Stages/AddWrapperDivClassTest.php | 2 +- .../Stages/DeduplicateStylesTest.php | 2 +- .../Stages/ExpandToAbsoluteUrlsTest.php | 2 +- .../Stages/ExtractBodyTest.php | 2 +- .../Stages/HandleSectionLinksTest.php | 2 +- .../Stages/HandleTOCMarkersTest.php | 2 +- .../Stages/HydrateHeaderPlaceholdersTest.php | 2 +- .../PostCacheTransformHookRunnerTest.php | 2 +- .../Stages/RenderDebugInfoTest.php | 2 +- .../includes/OutputTransform/TestUtils.php | 2 +- .../Revision/RenderedRevisionTest.php | 2 +- .../Revision/RevisionRendererTest.php | 2 +- .../ParserCacheSerializationTestCases.php | 2 +- .../includes/parser/ParserCacheTest.php | 2 +- .../includes/parser/ParserOutputTest.php | 5 ++-- .../parser/RevisionOutputCacheTest.php | 2 +- ...lidateParserCacheSerializationTestData.php | 2 +- .../Helper/HtmlInputTransformHelperTest.php | 2 +- .../Helper/HtmlOutputRendererHelperTest.php | 2 +- .../Parsoid/LanguageVariantConverterTest.php | 2 +- .../includes/Storage/PreparedEditTest.php | 2 +- .../content/WikitextContentHandlerTest.php | 2 +- .../PageBundleParserOutputConverterTest.php | 2 +- 126 files changed, 162 insertions(+), 124 deletions(-) diff --git a/RELEASE-NOTES-1.42 b/RELEASE-NOTES-1.42 index 8b5c384eb9a..0dd4c41efcb 100644 --- a/RELEASE-NOTES-1.42 +++ b/RELEASE-NOTES-1.42 @@ -241,6 +241,8 @@ because of Phabricator reports. - TransactionRoundDefiningUpdate - UserEditCountInfo - UserEditCountUpdate + - MediaWiki\Parser: + - ParserOutput - MediaWiki\Site: - CachingSiteStore - DBSiteStore diff --git a/autoload.php b/autoload.php index 36f2910f1f6..ac5586eeb36 100644 --- a/autoload.php +++ b/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', diff --git a/includes/Category/TrackingCategories.php b/includes/Category/TrackingCategories.php index 87e4e8496e8..b65aac18373 100644 --- a/includes/Category/TrackingCategories.php +++ b/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; /** diff --git a/includes/Hook/AlternateEditPreviewHook.php b/includes/Hook/AlternateEditPreviewHook.php index 529a4331685..c0233353c20 100644 --- a/includes/Hook/AlternateEditPreviewHook.php +++ b/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. diff --git a/includes/Hook/OutputPageParserOutputHook.php b/includes/Hook/OutputPageParserOutputHook.php index 0bb85e329ee..2f65ed974ca 100644 --- a/includes/Hook/OutputPageParserOutputHook.php +++ b/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. diff --git a/includes/HookContainer/HookRunner.php b/includes/HookContainer/HookRunner.php index 4fcf66775db..c86e9b52484 100644 --- a/includes/HookContainer/HookRunner.php +++ b/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', diff --git a/includes/Output/OutputPage.php b/includes/Output/OutputPage.php index 88f1cea8be1..9a25aa9a928 100644 --- a/includes/Output/OutputPage.php +++ b/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; diff --git a/includes/OutputTransform/ContentDOMTransformStage.php b/includes/OutputTransform/ContentDOMTransformStage.php index 90a82cd8f87..62277264118 100644 --- a/includes/OutputTransform/ContentDOMTransformStage.php +++ b/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; diff --git a/includes/OutputTransform/ContentTextTransformStage.php b/includes/OutputTransform/ContentTextTransformStage.php index cb130dd2dc9..b86dd1d8704 100644 --- a/includes/OutputTransform/ContentTextTransformStage.php +++ b/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' diff --git a/includes/OutputTransform/OutputTransformPipeline.php b/includes/OutputTransform/OutputTransformPipeline.php index 0ea77c39e9b..fe6180320ae 100644 --- a/includes/OutputTransform/OutputTransformPipeline.php +++ b/includes/OutputTransform/OutputTransformPipeline.php @@ -2,8 +2,8 @@ namespace Mediawiki\OutputTransform; +use MediaWiki\Parser\ParserOutput; use ParserOptions; -use ParserOutput; /** * @unstable diff --git a/includes/OutputTransform/OutputTransformStage.php b/includes/OutputTransform/OutputTransformStage.php index 0b7cf3baae2..1ef08be5479 100644 --- a/includes/OutputTransform/OutputTransformStage.php +++ b/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 diff --git a/includes/OutputTransform/Stages/AddRedirectHeader.php b/includes/OutputTransform/Stages/AddRedirectHeader.php index 8af7481b12d..d0f3dc5950a 100644 --- a/includes/OutputTransform/Stages/AddRedirectHeader.php +++ b/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 diff --git a/includes/OutputTransform/Stages/AddWrapperDivClass.php b/includes/OutputTransform/Stages/AddWrapperDivClass.php index 37300e6afd6..2ffd21b7f58 100644 --- a/includes/OutputTransform/Stages/AddWrapperDivClass.php +++ b/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 diff --git a/includes/OutputTransform/Stages/DeduplicateStyles.php b/includes/OutputTransform/Stages/DeduplicateStyles.php index 7fc56024965..22a0f9ce428 100644 --- a/includes/OutputTransform/Stages/DeduplicateStyles.php +++ b/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 diff --git a/includes/OutputTransform/Stages/ExpandToAbsoluteUrls.php b/includes/OutputTransform/Stages/ExpandToAbsoluteUrls.php index b9d12d47493..91ec282129a 100644 --- a/includes/OutputTransform/Stages/ExpandToAbsoluteUrls.php +++ b/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 diff --git a/includes/OutputTransform/Stages/ExtractBody.php b/includes/OutputTransform/Stages/ExtractBody.php index f3b8f6b17da..9c5abaf52d8 100644 --- a/includes/OutputTransform/Stages/ExtractBody.php +++ b/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; /** diff --git a/includes/OutputTransform/Stages/HandleSectionLinks.php b/includes/OutputTransform/Stages/HandleSectionLinks.php index f0420f689fd..42b194c4e6e 100644 --- a/includes/OutputTransform/Stages/HandleSectionLinks.php +++ b/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; diff --git a/includes/OutputTransform/Stages/HandleTOCMarkers.php b/includes/OutputTransform/Stages/HandleTOCMarkers.php index 4f0d01585b8..c156c7e0b6e 100644 --- a/includes/OutputTransform/Stages/HandleTOCMarkers.php +++ b/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; /** diff --git a/includes/OutputTransform/Stages/HydrateHeaderPlaceholders.php b/includes/OutputTransform/Stages/HydrateHeaderPlaceholders.php index 9b2a0f77936..20d2593c48a 100644 --- a/includes/OutputTransform/Stages/HydrateHeaderPlaceholders.php +++ b/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. diff --git a/includes/OutputTransform/Stages/PostCacheTransformHookRunner.php b/includes/OutputTransform/Stages/PostCacheTransformHookRunner.php index de31a566454..a012e5b37f0 100644 --- a/includes/OutputTransform/Stages/PostCacheTransformHookRunner.php +++ b/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 diff --git a/includes/OutputTransform/Stages/RenderDebugInfo.php b/includes/OutputTransform/Stages/RenderDebugInfo.php index e1d4a114b9e..217f3c94063 100644 --- a/includes/OutputTransform/Stages/RenderDebugInfo.php +++ b/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 diff --git a/includes/Rest/Handler/Helper/HtmlInputTransformHelper.php b/includes/Rest/Handler/Helper/HtmlInputTransformHelper.php index ac9a1db78ec..0818fe7fd66 100644 --- a/includes/Rest/Handler/Helper/HtmlInputTransformHelper.php +++ b/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; diff --git a/includes/Rest/Handler/Helper/HtmlMessageOutputHelper.php b/includes/Rest/Handler/Helper/HtmlMessageOutputHelper.php index 6e6b256cab2..01b9702f5a7 100644 --- a/includes/Rest/Handler/Helper/HtmlMessageOutputHelper.php +++ b/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; diff --git a/includes/Rest/Handler/Helper/HtmlOutputHelper.php b/includes/Rest/Handler/Helper/HtmlOutputHelper.php index 61515155e56..fe8b522d4cc 100644 --- a/includes/Rest/Handler/Helper/HtmlOutputHelper.php +++ b/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; diff --git a/includes/Rest/Handler/Helper/HtmlOutputRendererHelper.php b/includes/Rest/Handler/Helper/HtmlOutputRendererHelper.php index 336a801d0f7..7923b347ddb 100644 --- a/includes/Rest/Handler/Helper/HtmlOutputRendererHelper.php +++ b/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; diff --git a/includes/Revision/RenderedRevision.php b/includes/Revision/RenderedRevision.php index b6d87a2188e..811cf601645 100644 --- a/includes/Revision/RenderedRevision.php +++ b/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; diff --git a/includes/Revision/RevisionRenderer.php b/includes/Revision/RevisionRenderer.php index 713f5e46b73..2ed8604cc0a 100644 --- a/includes/Revision/RevisionRenderer.php +++ b/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; diff --git a/includes/Revision/SlotRenderingProvider.php b/includes/Revision/SlotRenderingProvider.php index 939c2223532..b83f76a7aa0 100644 --- a/includes/Revision/SlotRenderingProvider.php +++ b/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. diff --git a/includes/Status/StatusFormatter.php b/includes/Status/StatusFormatter.php index 52ab0775a59..b63d1bff5d5 100644 --- a/includes/Status/StatusFormatter.php +++ b/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; diff --git a/includes/Storage/DerivedPageDataUpdater.php b/includes/Storage/DerivedPageDataUpdater.php index 763626829bc..61eebd3c407 100644 --- a/includes/Storage/DerivedPageDataUpdater.php +++ b/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; diff --git a/includes/Storage/Hook/ParserOutputStashForEditHook.php b/includes/Storage/Hook/ParserOutputStashForEditHook.php index 7ac92093818..aae518f55c3 100644 --- a/includes/Storage/Hook/ParserOutputStashForEditHook.php +++ b/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; /** diff --git a/includes/Storage/PageEditStash.php b/includes/Storage/PageEditStash.php index d84fb7f25f2..83426815357 100644 --- a/includes/Storage/PageEditStash.php +++ b/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; diff --git a/includes/Storage/PreparedUpdate.php b/includes/Storage/PreparedUpdate.php index 0c220bb679d..fd16f898cc7 100644 --- a/includes/Storage/PreparedUpdate.php +++ b/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. diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php index 4f2dd81bb9e..d3b1a11888c 100644 --- a/includes/actions/InfoAction.php +++ b/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; diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php index 32c2ad75d7e..034a9866351 100644 --- a/includes/api/ApiParse.php +++ b/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; diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php index 4b6709a7f41..b11b998f5c0 100644 --- a/includes/content/ContentHandler.php +++ b/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; diff --git a/includes/content/CssContentHandler.php b/includes/content/CssContentHandler.php index 427bedab224..f2de5ecbc01 100644 --- a/includes/content/CssContentHandler.php +++ b/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; diff --git a/includes/content/FallbackContentHandler.php b/includes/content/FallbackContentHandler.php index edc220d8a3a..9eb5fbcadb2 100644 --- a/includes/content/FallbackContentHandler.php +++ b/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. diff --git a/includes/content/FileContentHandler.php b/includes/content/FileContentHandler.php index 0bf2a2cc969..c7affed7144 100644 --- a/includes/content/FileContentHandler.php +++ b/includes/content/FileContentHandler.php @@ -1,6 +1,7 @@ hideDeprecated( 'ParserOutput::setTOCHTML' ); - $this->hideDeprecated( 'ParserOutput::getTOCHTML' ); + $this->hideDeprecated( 'MediaWiki\Parser\ParserOutput::setTOCHTML' ); + $this->hideDeprecated( 'MediaWiki\Parser\ParserOutput::getTOCHTML' ); } /** diff --git a/tests/phpunit/includes/parser/RevisionOutputCacheTest.php b/tests/phpunit/includes/parser/RevisionOutputCacheTest.php index 3f033415920..b3c0f2d4b75 100644 --- a/tests/phpunit/includes/parser/RevisionOutputCacheTest.php +++ b/tests/phpunit/includes/parser/RevisionOutputCacheTest.php @@ -8,6 +8,7 @@ use InvalidArgumentException; use MediaWiki\Json\JsonCodec; use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageIdentityValue; +use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\RevisionOutputCache; use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\RevisionRecord; @@ -17,7 +18,6 @@ use MediaWiki\Utils\MWTimestamp; use MediaWikiIntegrationTestCase; use NullStatsdDataFactory; use ParserOptions; -use ParserOutput; use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; use Psr\Log\NullLogger; diff --git a/tests/phpunit/includes/parser/validateParserCacheSerializationTestData.php b/tests/phpunit/includes/parser/validateParserCacheSerializationTestData.php index 1ae761a023f..b6b0c88c0c2 100644 --- a/tests/phpunit/includes/parser/validateParserCacheSerializationTestData.php +++ b/tests/phpunit/includes/parser/validateParserCacheSerializationTestData.php @@ -5,7 +5,7 @@ namespace MediaWiki\Tests\Parser; use CacheTime; use Maintenance; use MediaWiki\Logger\ConsoleLogger; -use ParserOutput; +use MediaWiki\Parser\ParserOutput; use Wikimedia\Tests\SerializationTestUtils; define( 'MW_AUTOLOAD_TEST_CLASSES', true ); diff --git a/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlInputTransformHelperTest.php b/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlInputTransformHelperTest.php index d9f0053f5f4..fe0ba00d669 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlInputTransformHelperTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlInputTransformHelperTest.php @@ -12,6 +12,7 @@ use MediaWiki\MainConfigSchema; use MediaWiki\Message\Converter; use MediaWiki\Message\TextFormatter; use MediaWiki\Page\PageIdentityValue; +use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\Parsoid\HtmlToContentTransform; use MediaWiki\Parser\Parsoid\HtmlTransformFactory; use MediaWiki\Parser\Parsoid\PageBundleParserOutputConverter; @@ -27,7 +28,6 @@ use MediaWiki\Revision\SlotRecord; use MediaWikiIntegrationTestCase; use NullStatsdDataFactory; use ParserOptions; -use ParserOutput; use PHPUnit\Framework\MockObject\MockObject; use TextContent; use Wikimedia\Message\MessageValue; diff --git a/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php b/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php index daa2ecb6210..e879480f791 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php @@ -19,6 +19,7 @@ use MediaWiki\Page\PageIdentityValue; use MediaWiki\Page\PageRecord; use MediaWiki\Page\ParserOutputAccess; use MediaWiki\Parser\ParserCacheFactory; +use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\Parsoid\PageBundleParserOutputConverter; use MediaWiki\Parser\Parsoid\ParsoidOutputAccess; use MediaWiki\Parser\Parsoid\ParsoidParser; @@ -41,7 +42,6 @@ use MediaWikiIntegrationTestCase; use NullStatsdDataFactory; use ParserCache; use ParserOptions; -use ParserOutput; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\Rule\InvocationOrder; use Psr\Log\NullLogger; diff --git a/tests/phpunit/integration/includes/parser/Parsoid/LanguageVariantConverterTest.php b/tests/phpunit/integration/includes/parser/Parsoid/LanguageVariantConverterTest.php index 06e4a9cdc42..96d8c9793de 100644 --- a/tests/phpunit/integration/includes/parser/Parsoid/LanguageVariantConverterTest.php +++ b/tests/phpunit/integration/includes/parser/Parsoid/LanguageVariantConverterTest.php @@ -4,8 +4,8 @@ namespace MediaWiki\Parser\Parsoid; use Language; use MediaWiki\Page\PageIdentity; +use MediaWiki\Parser\ParserOutput; use MediaWikiIntegrationTestCase; -use ParserOutput; use Wikimedia\Bcp47Code\Bcp47CodeValue; use Wikimedia\Parsoid\Core\PageBundle; use Wikimedia\Parsoid\Parsoid; diff --git a/tests/phpunit/unit/includes/Storage/PreparedEditTest.php b/tests/phpunit/unit/includes/Storage/PreparedEditTest.php index b2affd7fdc3..3678a0090b1 100644 --- a/tests/phpunit/unit/includes/Storage/PreparedEditTest.php +++ b/tests/phpunit/unit/includes/Storage/PreparedEditTest.php @@ -2,7 +2,7 @@ namespace MediaWiki\Edit; -use ParserOutput; +use MediaWiki\Parser\ParserOutput; /** * @covers \MediaWiki\Edit\PreparedEdit diff --git a/tests/phpunit/unit/includes/content/WikitextContentHandlerTest.php b/tests/phpunit/unit/includes/content/WikitextContentHandlerTest.php index 4453716215c..a5c59c70055 100644 --- a/tests/phpunit/unit/includes/content/WikitextContentHandlerTest.php +++ b/tests/phpunit/unit/includes/content/WikitextContentHandlerTest.php @@ -8,6 +8,7 @@ use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\Linker\LinkRenderer; use MediaWiki\Parser\MagicWord; use MediaWiki\Parser\MagicWordFactory; +use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\Parsoid\ParsoidParser; use MediaWiki\Parser\Parsoid\ParsoidParserFactory; use MediaWiki\Revision\SlotRecord; @@ -20,7 +21,6 @@ use MWException; use Parser; use ParserFactory; use ParserOptions; -use ParserOutput; use ReflectionClass; use Wikimedia\UUID\GlobalIdGenerator; use WikitextContent; diff --git a/tests/phpunit/unit/includes/parser/Parsoid/PageBundleParserOutputConverterTest.php b/tests/phpunit/unit/includes/parser/Parsoid/PageBundleParserOutputConverterTest.php index 216b528bc10..bec9ef9d872 100644 --- a/tests/phpunit/unit/includes/parser/Parsoid/PageBundleParserOutputConverterTest.php +++ b/tests/phpunit/unit/includes/parser/Parsoid/PageBundleParserOutputConverterTest.php @@ -2,9 +2,9 @@ namespace MediaWiki\Parser\Parsoid; +use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\ParserOutputFlags; use MediaWikiUnitTestCase; -use ParserOutput; use Wikimedia\Parsoid\Core\PageBundle; /**