diff options
Diffstat (limited to 'includes')
110 files changed, 269 insertions, 130 deletions
diff --git a/includes/HookContainer/HookRunner.php b/includes/HookContainer/HookRunner.php index 19a31d5fc9d4..511c79fa64b5 100644 --- a/includes/HookContainer/HookRunner.php +++ b/includes/HookContainer/HookRunner.php @@ -18,6 +18,7 @@ use MediaWiki\Output\OutputPage; use MediaWiki\Page\PageIdentity; use MediaWiki\Page\ProperPageIdentity; use MediaWiki\Parser\Parser; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Permissions\Authority; use MediaWiki\RenameUser\RenameuserSQL; @@ -27,7 +28,6 @@ use MediaWiki\Session\Session; use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\Title\Title; use MediaWiki\User\UserIdentity; -use ParserOptions; use SearchEngine; use Skin; use StatusValue; diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php index d687871c15d9..a1e0bdd33ee8 100644 --- a/includes/MediaWikiServices.php +++ b/includes/MediaWikiServices.php @@ -21,7 +21,6 @@ namespace MediaWiki; use CryptHKDF; -use DateFormatterFactory; use ExternalStoreAccess; use ExternalStoreFactory; use JobQueueGroup; @@ -111,9 +110,12 @@ use MediaWiki\Page\RedirectStore; use MediaWiki\Page\RollbackPageFactory; use MediaWiki\Page\UndeletePageFactory; use MediaWiki\Page\WikiPageFactory; +use MediaWiki\Parser\DateFormatterFactory; use MediaWiki\Parser\MagicWordFactory; use MediaWiki\Parser\Parser; +use MediaWiki\Parser\ParserCache; use MediaWiki\Parser\ParserCacheFactory; +use MediaWiki\Parser\ParserFactory; use MediaWiki\Parser\Parsoid\Config\PageConfigFactory; use MediaWiki\Parser\Parsoid\Config\SiteConfig; use MediaWiki\Parser\Parsoid\HtmlTransformFactory; @@ -192,8 +194,6 @@ use MessageCache; use MWLBFactory; use ObjectCacheFactory; use OldRevisionImporter; -use ParserCache; -use ParserFactory; use RepoGroup; use SearchEngine; use SearchEngineConfig; diff --git a/includes/Output/OutputPage.php b/includes/Output/OutputPage.php index b3bab8ecea17..544353cde024 100644 --- a/includes/Output/OutputPage.php +++ b/includes/Output/OutputPage.php @@ -49,6 +49,7 @@ use MediaWiki\Message\Message; use MediaWiki\Page\PageRecord; use MediaWiki\Page\PageReference; use MediaWiki\Parser\Parser; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\ParserOutputFlags; use MediaWiki\Parser\Sanitizer; @@ -66,7 +67,6 @@ use MediaWiki\Title\TitleValue; use MediaWiki\Utils\MWTimestamp; use OOUI\Element; use OOUI\Theme; -use ParserOptions; use RuntimeException; use Skin; use Wikimedia\Assert\Assert; diff --git a/includes/OutputTransform/ContentDOMTransformStage.php b/includes/OutputTransform/ContentDOMTransformStage.php index e6e7aa9710b1..3708aba2e750 100644 --- a/includes/OutputTransform/ContentDOMTransformStage.php +++ b/includes/OutputTransform/ContentDOMTransformStage.php @@ -2,9 +2,9 @@ namespace MediaWiki\OutputTransform; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\Parsoid\PageBundleParserOutputConverter; -use ParserOptions; use stdClass; use Wikimedia\Parsoid\Core\PageBundle; use Wikimedia\Parsoid\DOM\Document; diff --git a/includes/OutputTransform/ContentTextTransformStage.php b/includes/OutputTransform/ContentTextTransformStage.php index 342f2ad86b30..8d61473edd9f 100644 --- a/includes/OutputTransform/ContentTextTransformStage.php +++ b/includes/OutputTransform/ContentTextTransformStage.php @@ -2,8 +2,8 @@ namespace MediaWiki\OutputTransform; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; -use ParserOptions; /** * 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 72844a3f1e68..d7d53b19ea2b 100644 --- a/includes/OutputTransform/OutputTransformPipeline.php +++ b/includes/OutputTransform/OutputTransformPipeline.php @@ -2,10 +2,10 @@ namespace MediaWiki\OutputTransform; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\ParserOutputFlags; use MediaWiki\Parser\Parsoid\PageBundleParserOutputConverter; -use ParserOptions; /** * @unstable diff --git a/includes/OutputTransform/OutputTransformStage.php b/includes/OutputTransform/OutputTransformStage.php index 2a9722a8aaad..24d49e6d62ed 100644 --- a/includes/OutputTransform/OutputTransformStage.php +++ b/includes/OutputTransform/OutputTransformStage.php @@ -3,8 +3,8 @@ namespace MediaWiki\OutputTransform; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; -use ParserOptions; use Psr\Log\LoggerInterface; /** diff --git a/includes/OutputTransform/Stages/AddRedirectHeader.php b/includes/OutputTransform/Stages/AddRedirectHeader.php index af5e6707ec7b..e468d804f593 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\ParserOptions; use MediaWiki\Parser\ParserOutput; -use ParserOptions; /** * Adds RedirectHeader if it exists diff --git a/includes/OutputTransform/Stages/AddWrapperDivClass.php b/includes/OutputTransform/Stages/AddWrapperDivClass.php index 0237d6470933..89cba7d14450 100644 --- a/includes/OutputTransform/Stages/AddWrapperDivClass.php +++ b/includes/OutputTransform/Stages/AddWrapperDivClass.php @@ -7,8 +7,8 @@ use MediaWiki\Html\Html; use MediaWiki\Language\Language; use MediaWiki\Languages\LanguageFactory; use MediaWiki\OutputTransform\ContentTextTransformStage; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; -use ParserOptions; use Psr\Log\LoggerInterface; /** diff --git a/includes/OutputTransform/Stages/DeduplicateStyles.php b/includes/OutputTransform/Stages/DeduplicateStyles.php index 61ac1c698ce1..692e5933a910 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\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\Sanitizer; -use ParserOptions; /** * Generates a list of unique style links diff --git a/includes/OutputTransform/Stages/ExecutePostCacheTransformHooks.php b/includes/OutputTransform/Stages/ExecutePostCacheTransformHooks.php index a0c5ce2f5087..d68d08d7d88a 100644 --- a/includes/OutputTransform/Stages/ExecutePostCacheTransformHooks.php +++ b/includes/OutputTransform/Stages/ExecutePostCacheTransformHooks.php @@ -6,8 +6,8 @@ use MediaWiki\Config\ServiceOptions; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\OutputTransform\ContentTextTransformStage; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; -use ParserOptions; use Psr\Log\LoggerInterface; /** diff --git a/includes/OutputTransform/Stages/ExpandToAbsoluteUrls.php b/includes/OutputTransform/Stages/ExpandToAbsoluteUrls.php index a7044fc89ac2..db853b72db3b 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\ParserOptions; use MediaWiki\Parser\ParserOutput; -use ParserOptions; /** * Expand relative links to absolute URLs diff --git a/includes/OutputTransform/Stages/ExtractBody.php b/includes/OutputTransform/Stages/ExtractBody.php index 6dc4d511d53b..badd23709d39 100644 --- a/includes/OutputTransform/Stages/ExtractBody.php +++ b/includes/OutputTransform/Stages/ExtractBody.php @@ -6,10 +6,10 @@ use MediaWiki\Config\ServiceOptions; use MediaWiki\Html\HtmlHelper; use MediaWiki\OutputTransform\ContentTextTransformStage; use MediaWiki\Parser\Parser; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\Parsoid\ParsoidParser; use MediaWiki\Utils\UrlUtils; -use ParserOptions; use Psr\Log\LoggerInterface; use Wikimedia\RemexHtml\Serializer\SerializerNode; diff --git a/includes/OutputTransform/Stages/HandleParsoidSectionLinks.php b/includes/OutputTransform/Stages/HandleParsoidSectionLinks.php index 6d41afd00fbb..9318c613a343 100644 --- a/includes/OutputTransform/Stages/HandleParsoidSectionLinks.php +++ b/includes/OutputTransform/Stages/HandleParsoidSectionLinks.php @@ -10,10 +10,10 @@ namespace MediaWiki\OutputTransform\Stages; use MediaWiki\Config\ServiceOptions; use MediaWiki\Context\RequestContext; use MediaWiki\OutputTransform\ContentDOMTransformStage; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\ParserOutputFlags; use MediaWiki\Title\TitleFactory; -use ParserOptions; use Psr\Log\LoggerInterface; use Skin; use Wikimedia\Parsoid\DOM\Document; diff --git a/includes/OutputTransform/Stages/HandleSectionLinks.php b/includes/OutputTransform/Stages/HandleSectionLinks.php index 9d7fd78ee697..3e981868c528 100644 --- a/includes/OutputTransform/Stages/HandleSectionLinks.php +++ b/includes/OutputTransform/Stages/HandleSectionLinks.php @@ -9,11 +9,11 @@ use MediaWiki\Html\Html; use MediaWiki\Html\HtmlHelper; use MediaWiki\MainConfigNames; use MediaWiki\OutputTransform\ContentTextTransformStage; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\ParserOutputFlags; use MediaWiki\Parser\Sanitizer; use MediaWiki\Title\TitleFactory; -use ParserOptions; use Psr\Log\LoggerInterface; use Skin; diff --git a/includes/OutputTransform/Stages/HandleTOCMarkers.php b/includes/OutputTransform/Stages/HandleTOCMarkers.php index 4b0ef3de41a4..8d8a54ecb1d3 100644 --- a/includes/OutputTransform/Stages/HandleTOCMarkers.php +++ b/includes/OutputTransform/Stages/HandleTOCMarkers.php @@ -10,10 +10,10 @@ use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\OutputTransform\ContentTextTransformStage; use MediaWiki\Parser\Parser; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\Sanitizer; use MediaWiki\Tidy\TidyDriverBase; -use ParserOptions; use Psr\Log\LoggerInterface; use Wikimedia\Parsoid\Core\TOCData; diff --git a/includes/OutputTransform/Stages/HydrateHeaderPlaceholders.php b/includes/OutputTransform/Stages/HydrateHeaderPlaceholders.php index 8cf139281add..dda8bb0430a0 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\ParserOptions; use MediaWiki\Parser\ParserOutput; -use ParserOptions; /** * Hydrate slot section header placeholders generated by RevisionRenderer. diff --git a/includes/OutputTransform/Stages/ParsoidLocalization.php b/includes/OutputTransform/Stages/ParsoidLocalization.php index 3cd4e973d003..ae3511432c79 100644 --- a/includes/OutputTransform/Stages/ParsoidLocalization.php +++ b/includes/OutputTransform/Stages/ParsoidLocalization.php @@ -4,8 +4,8 @@ namespace MediaWiki\OutputTransform\Stages; use MediaWiki\Message\Message; use MediaWiki\OutputTransform\ContentDOMTransformStage; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; -use ParserOptions; use Wikimedia\Bcp47Code\Bcp47Code; use Wikimedia\Bcp47Code\Bcp47CodeValue; use Wikimedia\Parsoid\DOM\Document; diff --git a/includes/OutputTransform/Stages/RenderDebugInfo.php b/includes/OutputTransform/Stages/RenderDebugInfo.php index 41f3da69da6b..4b319a8f9c07 100644 --- a/includes/OutputTransform/Stages/RenderDebugInfo.php +++ b/includes/OutputTransform/Stages/RenderDebugInfo.php @@ -8,8 +8,8 @@ use MediaWiki\HookContainer\HookRunner; use MediaWiki\Language\RawMessage; use MediaWiki\Message\Message; use MediaWiki\OutputTransform\ContentTextTransformStage; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; -use ParserOptions; use Psr\Log\LoggerInterface; /** diff --git a/includes/Rest/Handler/CompareHandler.php b/includes/Rest/Handler/CompareHandler.php index 9538c1574de2..b39d6bb263f2 100644 --- a/includes/Rest/Handler/CompareHandler.php +++ b/includes/Rest/Handler/CompareHandler.php @@ -3,6 +3,7 @@ namespace MediaWiki\Rest\Handler; use MediaWiki\Content\TextContent; +use MediaWiki\Parser\ParserFactory; use MediaWiki\Rest\Handler; use MediaWiki\Rest\LocalizedHttpException; use MediaWiki\Rest\StringStream; @@ -11,7 +12,6 @@ use MediaWiki\Revision\RevisionLookup; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; use MediaWiki\Revision\SuppressedDataException; -use ParserFactory; use Wikimedia\Message\MessageValue; use Wikimedia\ParamValidator\ParamValidator; diff --git a/includes/Rest/Handler/Helper/HtmlInputTransformHelper.php b/includes/Rest/Handler/Helper/HtmlInputTransformHelper.php index 911f49537b18..1acbc3ebdc55 100644 --- a/includes/Rest/Handler/Helper/HtmlInputTransformHelper.php +++ b/includes/Rest/Handler/Helper/HtmlInputTransformHelper.php @@ -31,6 +31,7 @@ use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageLookup; use MediaWiki\Page\PageRecord; use MediaWiki\Page\ParserOutputAccess; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\Parsoid\HtmlToContentTransform; use MediaWiki\Parser\Parsoid\HtmlTransformFactory; @@ -44,7 +45,6 @@ use MediaWiki\Revision\RevisionLookup; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Status\Status; use MWUnknownContentModelException; -use ParserOptions; use Wikimedia\Bcp47Code\Bcp47Code; use Wikimedia\Message\MessageValue; use Wikimedia\ParamValidator\ParamValidator; diff --git a/includes/Rest/Handler/Helper/HtmlOutputRendererHelper.php b/includes/Rest/Handler/Helper/HtmlOutputRendererHelper.php index 71342305d746..0f3dafe96bbb 100644 --- a/includes/Rest/Handler/Helper/HtmlOutputRendererHelper.php +++ b/includes/Rest/Handler/Helper/HtmlOutputRendererHelper.php @@ -34,6 +34,7 @@ use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageLookup; use MediaWiki\Page\PageRecord; use MediaWiki\Page\ParserOutputAccess; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\Parsoid\Config\SiteConfig as ParsoidSiteConfig; use MediaWiki\Parser\Parsoid\HtmlTransformFactory; @@ -52,7 +53,6 @@ use MediaWiki\Revision\SlotRecord; use MediaWiki\Status\Status; use MediaWiki\Title\Title; use MWUnknownContentModelException; -use ParserOptions; 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 604122b4be24..370aaa3db2bc 100644 --- a/includes/Revision/RenderedRevision.php +++ b/includes/Revision/RenderedRevision.php @@ -27,10 +27,10 @@ use LogicException; use MediaWiki\Content\Content; use MediaWiki\Content\Renderer\ContentRenderer; use MediaWiki\Page\PageReference; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\ParserOutputFlags; use MediaWiki\Permissions\Authority; -use ParserOptions; 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 fd899b214447..f85f3757d802 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\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Permissions\Authority; -use ParserOptions; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; use Wikimedia\Rdbms\ILoadBalancer; diff --git a/includes/Storage/DerivedPageDataUpdater.php b/includes/Storage/DerivedPageDataUpdater.php index e457b7dd4e7b..06d120ccf3cb 100644 --- a/includes/Storage/DerivedPageDataUpdater.php +++ b/includes/Storage/DerivedPageDataUpdater.php @@ -43,6 +43,8 @@ use MediaWiki\MainConfigNames; use MediaWiki\Page\PageIdentity; use MediaWiki\Page\ParserOutputAccess; use MediaWiki\Page\WikiPageFactory; +use MediaWiki\Parser\ParserCache; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Permissions\PermissionManager; use MediaWiki\ResourceLoader as RL; @@ -62,8 +64,6 @@ use MediaWiki\User\UserNameUtils; use MediaWiki\Utils\MWTimestamp; use MessageCache; use MWUnknownContentModelException; -use ParserCache; -use ParserOptions; use ParsoidCachePrewarmJob; use Psr\Log\LoggerAwareInterface; use Psr\Log\LoggerInterface; diff --git a/includes/Storage/Hook/ArticlePrepareTextForEditHook.php b/includes/Storage/Hook/ArticlePrepareTextForEditHook.php index f85a901fe769..6c54ff0e1d1b 100644 --- a/includes/Storage/Hook/ArticlePrepareTextForEditHook.php +++ b/includes/Storage/Hook/ArticlePrepareTextForEditHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Storage\Hook; -use ParserOptions; +use MediaWiki\Parser\ParserOptions; use WikiPage; /** diff --git a/includes/Storage/PageUpdaterFactory.php b/includes/Storage/PageUpdaterFactory.php index f2b49f2389ba..187467b24cfd 100644 --- a/includes/Storage/PageUpdaterFactory.php +++ b/includes/Storage/PageUpdaterFactory.php @@ -29,6 +29,7 @@ use MediaWiki\Language\Language; use MediaWiki\MainConfigNames; use MediaWiki\Page\PageIdentity; use MediaWiki\Page\WikiPageFactory; +use MediaWiki\Parser\ParserCache; use MediaWiki\Permissions\PermissionManager; use MediaWiki\Revision\RevisionRenderer; use MediaWiki\Revision\RevisionStore; @@ -40,7 +41,6 @@ use MediaWiki\User\UserGroupManager; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserNameUtils; use MessageCache; -use ParserCache; use Psr\Log\LoggerInterface; use Wikimedia\ObjectCache\WANObjectCache; use Wikimedia\Rdbms\ILBFactory; diff --git a/includes/api/ApiComparePages.php b/includes/api/ApiComparePages.php index 2a67550d91a9..10077604c32c 100644 --- a/includes/api/ApiComparePages.php +++ b/includes/api/ApiComparePages.php @@ -26,6 +26,7 @@ use MediaWiki\CommentFormatter\CommentFormatter; use MediaWiki\Content\IContentHandlerFactory; use MediaWiki\Content\Transform\ContentTransformer; use MediaWiki\Context\DerivativeContext; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Revision\ArchivedRevisionLookup; use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\RevisionArchiveRecord; @@ -37,7 +38,6 @@ use MediaWiki\Title\Title; use MediaWiki\User\TempUser\TempUserCreator; use MediaWiki\User\UserFactory; use MWContentSerializationException; -use ParserOptions; use Wikimedia\ParamValidator\ParamValidator; use Wikimedia\RequestTimeout\TimeoutException; diff --git a/includes/api/ApiExpandTemplates.php b/includes/api/ApiExpandTemplates.php index 7a1b6f49c797..ce961fc4209e 100644 --- a/includes/api/ApiExpandTemplates.php +++ b/includes/api/ApiExpandTemplates.php @@ -24,10 +24,10 @@ namespace MediaWiki\Api; use MediaWiki\Json\FormatJson; use MediaWiki\Parser\Parser; +use MediaWiki\Parser\ParserFactory; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Revision\RevisionStore; use MediaWiki\Title\Title; -use ParserFactory; -use ParserOptions; use Wikimedia\ParamValidator\ParamValidator; /** diff --git a/includes/api/ApiFeedWatchlist.php b/includes/api/ApiFeedWatchlist.php index 8d4ef191ca45..60c17aa8b068 100644 --- a/includes/api/ApiFeedWatchlist.php +++ b/includes/api/ApiFeedWatchlist.php @@ -25,10 +25,10 @@ namespace MediaWiki\Api; use Exception; use MediaWiki\Feed\FeedItem; use MediaWiki\MainConfigNames; +use MediaWiki\Parser\ParserFactory; use MediaWiki\Request\FauxRequest; use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\Title\Title; -use ParserFactory; use Wikimedia\ParamValidator\ParamValidator; use Wikimedia\ParamValidator\TypeDef\IntegerDef; diff --git a/includes/api/ApiHookRunner.php b/includes/api/ApiHookRunner.php index da38ebe6eee0..1d1bfa7f41f1 100644 --- a/includes/api/ApiHookRunner.php +++ b/includes/api/ApiHookRunner.php @@ -4,9 +4,9 @@ namespace MediaWiki\Api; use Article; use MediaWiki\HookContainer\HookContainer; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Session\Session; use MediaWiki\User\UserIdentity; -use ParserOptions; /** * This class provides an implementation of the hook interfaces used diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php index e304aab48931..99edf3f2ec84 100644 --- a/includes/api/ApiParse.php +++ b/includes/api/ApiParse.php @@ -40,6 +40,8 @@ use MediaWiki\Output\OutputPage; use MediaWiki\Page\PageReference; use MediaWiki\Page\WikiPageFactory; use MediaWiki\Parser\Parser; +use MediaWiki\Parser\ParserFactory; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\ParserOutputFlags; use MediaWiki\PoolCounter\PoolCounterWorkViaCallback; @@ -55,8 +57,6 @@ use MediaWiki\User\UserFactory; use MediaWiki\Utils\UrlUtils; use MediaWiki\WikiMap\WikiMap; use MWContentSerializationException; -use ParserFactory; -use ParserOptions; use Skin; use SkinFactory; use Wikimedia\ParamValidator\ParamValidator; diff --git a/includes/api/ApiQueryAllDeletedRevisions.php b/includes/api/ApiQueryAllDeletedRevisions.php index 8d84c9300b40..9845a8679cf9 100644 --- a/includes/api/ApiQueryAllDeletedRevisions.php +++ b/includes/api/ApiQueryAllDeletedRevisions.php @@ -32,6 +32,7 @@ use MediaWiki\Content\Renderer\ContentRenderer; use MediaWiki\Content\Transform\ContentTransformer; use MediaWiki\MainConfigNames; use MediaWiki\ParamValidator\TypeDef\UserDef; +use MediaWiki\Parser\ParserFactory; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionStore; use MediaWiki\Revision\SlotRoleRegistry; @@ -41,7 +42,6 @@ use MediaWiki\Title\NamespaceInfo; use MediaWiki\Title\Title; use MediaWiki\User\TempUser\TempUserCreator; use MediaWiki\User\UserFactory; -use ParserFactory; use Wikimedia\ParamValidator\ParamValidator; use Wikimedia\Rdbms\IExpression; use Wikimedia\Rdbms\LikeValue; diff --git a/includes/api/ApiQueryAllRevisions.php b/includes/api/ApiQueryAllRevisions.php index 9028ec024060..ceb687aa330c 100644 --- a/includes/api/ApiQueryAllRevisions.php +++ b/includes/api/ApiQueryAllRevisions.php @@ -29,6 +29,7 @@ use MediaWiki\Content\Renderer\ContentRenderer; use MediaWiki\Content\Transform\ContentTransformer; use MediaWiki\MainConfigNames; use MediaWiki\ParamValidator\TypeDef\UserDef; +use MediaWiki\Parser\ParserFactory; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionStore; use MediaWiki\Revision\SlotRoleRegistry; @@ -37,7 +38,6 @@ use MediaWiki\Title\Title; use MediaWiki\User\ActorMigration; use MediaWiki\User\TempUser\TempUserCreator; use MediaWiki\User\UserFactory; -use ParserFactory; use Wikimedia\ParamValidator\ParamValidator; /** diff --git a/includes/api/ApiQueryDeletedRevisions.php b/includes/api/ApiQueryDeletedRevisions.php index af3ab5f1ee21..58aec52654ee 100644 --- a/includes/api/ApiQueryDeletedRevisions.php +++ b/includes/api/ApiQueryDeletedRevisions.php @@ -32,6 +32,7 @@ use MediaWiki\Content\IContentHandlerFactory; use MediaWiki\Content\Renderer\ContentRenderer; use MediaWiki\Content\Transform\ContentTransformer; use MediaWiki\ParamValidator\TypeDef\UserDef; +use MediaWiki\Parser\ParserFactory; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionStore; use MediaWiki\Revision\SlotRoleRegistry; @@ -40,7 +41,6 @@ use MediaWiki\Storage\NameTableStore; use MediaWiki\Title\Title; use MediaWiki\User\TempUser\TempUserCreator; use MediaWiki\User\UserFactory; -use ParserFactory; use Wikimedia\ParamValidator\ParamValidator; /** diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php index 4ad15e0d3bff..1a00e25c6c6b 100644 --- a/includes/api/ApiQueryRevisions.php +++ b/includes/api/ApiQueryRevisions.php @@ -29,6 +29,7 @@ use MediaWiki\Content\Renderer\ContentRenderer; use MediaWiki\Content\Transform\ContentTransformer; use MediaWiki\Page\PageIdentity; use MediaWiki\ParamValidator\TypeDef\UserDef; +use MediaWiki\Parser\ParserFactory; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionStore; use MediaWiki\Revision\SlotRoleRegistry; @@ -40,7 +41,6 @@ use MediaWiki\Title\TitleFormatter; use MediaWiki\User\ActorMigration; use MediaWiki\User\TempUser\TempUserCreator; use MediaWiki\User\UserFactory; -use ParserFactory; use Wikimedia\ParamValidator\ParamValidator; /** diff --git a/includes/api/ApiQueryRevisionsBase.php b/includes/api/ApiQueryRevisionsBase.php index 25dc9bdd86de..b53c6c7f7b47 100644 --- a/includes/api/ApiQueryRevisionsBase.php +++ b/includes/api/ApiQueryRevisionsBase.php @@ -33,6 +33,8 @@ use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Parser\Parser; +use MediaWiki\Parser\ParserFactory; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Revision\RevisionAccessException; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionStore; @@ -42,8 +44,6 @@ use MediaWiki\Title\Title; use MediaWiki\User\TempUser\TempUserCreator; use MediaWiki\User\UserFactory; use MediaWiki\User\UserNameUtils; -use ParserFactory; -use ParserOptions; use stdClass; use Wikimedia\ParamValidator\ParamValidator; use Wikimedia\ParamValidator\TypeDef\EnumDef; diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php index 02d8a4824049..4283417f030c 100644 --- a/includes/api/ApiQuerySiteinfo.php +++ b/includes/api/ApiQuerySiteinfo.php @@ -32,6 +32,7 @@ use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Parser\MagicWordFactory; +use MediaWiki\Parser\ParserFactory; use MediaWiki\Registration\ExtensionRegistry; use MediaWiki\ResourceLoader\SkinModule; use MediaWiki\SiteStats\SiteStats; @@ -47,7 +48,6 @@ use MediaWiki\Utils\ExtensionInfo; use MediaWiki\Utils\GitInfo; use MediaWiki\Utils\UrlUtils; use MediaWiki\WikiMap\WikiMap; -use ParserFactory; use Skin; use SkinFactory; use UploadBase; diff --git a/includes/api/Hook/ApiMakeParserOptionsHook.php b/includes/api/Hook/ApiMakeParserOptionsHook.php index 8ed8299af147..b4b4ccd5faa0 100644 --- a/includes/api/Hook/ApiMakeParserOptionsHook.php +++ b/includes/api/Hook/ApiMakeParserOptionsHook.php @@ -3,8 +3,8 @@ namespace MediaWiki\Api\Hook; use MediaWiki\Api\ApiBase; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Title\Title; -use ParserOptions; use Wikimedia\ScopedCallback; /** diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php index 4391906a1339..3c109a857fab 100644 --- a/includes/content/ContentHandler.php +++ b/includes/content/ContentHandler.php @@ -50,6 +50,7 @@ use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Page\ParserOutputAccess; +use MediaWiki\Parser\ParserCache; use MediaWiki\Parser\ParserOutput; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; @@ -59,7 +60,6 @@ use MediaWiki\Title\Title; use MWContentSerializationException; use MWException; use MWUnknownContentModelException; -use ParserCache; use SearchEngine; use SearchIndexField; use SlotDiffRenderer; diff --git a/includes/content/Hook/ContentGetParserOutputHook.php b/includes/content/Hook/ContentGetParserOutputHook.php index cab4e85abd95..ef45f9e21646 100644 --- a/includes/content/Hook/ContentGetParserOutputHook.php +++ b/includes/content/Hook/ContentGetParserOutputHook.php @@ -3,9 +3,9 @@ namespace MediaWiki\Content\Hook; use MediaWiki\Content\Content; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Title\Title; -use ParserOptions; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/content/Renderer/ContentParseParams.php b/includes/content/Renderer/ContentParseParams.php index 58e4582dc8a4..be902c1d0b67 100644 --- a/includes/content/Renderer/ContentParseParams.php +++ b/includes/content/Renderer/ContentParseParams.php @@ -2,8 +2,8 @@ namespace MediaWiki\Content\Renderer; use MediaWiki\Page\PageReference; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; -use ParserOptions; /** * @internal diff --git a/includes/content/Renderer/ContentRenderer.php b/includes/content/Renderer/ContentRenderer.php index 1ae8025bc931..fed257606998 100644 --- a/includes/content/Renderer/ContentRenderer.php +++ b/includes/content/Renderer/ContentRenderer.php @@ -4,9 +4,9 @@ namespace MediaWiki\Content\Renderer; use MediaWiki\Content\Content; use MediaWiki\Content\IContentHandlerFactory; use MediaWiki\Page\PageReference; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Revision\RevisionRecord; -use ParserOptions; use Wikimedia\UUID\GlobalIdGenerator; /** diff --git a/includes/content/Transform/ContentTransformer.php b/includes/content/Transform/ContentTransformer.php index 82dad75af9d2..26cd1be160b4 100644 --- a/includes/content/Transform/ContentTransformer.php +++ b/includes/content/Transform/ContentTransformer.php @@ -4,8 +4,8 @@ namespace MediaWiki\Content\Transform; use MediaWiki\Content\Content; use MediaWiki\Content\IContentHandlerFactory; use MediaWiki\Page\PageReference; +use MediaWiki\Parser\ParserOptions; use MediaWiki\User\UserIdentity; -use ParserOptions; /** * A service to transform content. diff --git a/includes/content/Transform/PreSaveTransformParams.php b/includes/content/Transform/PreSaveTransformParams.php index bc8da70db4f2..eb44a0cdd095 100644 --- a/includes/content/Transform/PreSaveTransformParams.php +++ b/includes/content/Transform/PreSaveTransformParams.php @@ -2,8 +2,8 @@ namespace MediaWiki\Content\Transform; use MediaWiki\Page\PageReference; +use MediaWiki\Parser\ParserOptions; use MediaWiki\User\UserIdentity; -use ParserOptions; /** * @since 1.37 diff --git a/includes/content/Transform/PreSaveTransformParamsValue.php b/includes/content/Transform/PreSaveTransformParamsValue.php index 6bbd94191736..91ff5948ada1 100644 --- a/includes/content/Transform/PreSaveTransformParamsValue.php +++ b/includes/content/Transform/PreSaveTransformParamsValue.php @@ -2,8 +2,8 @@ namespace MediaWiki\Content\Transform; use MediaWiki\Page\PageReference; +use MediaWiki\Parser\ParserOptions; use MediaWiki\User\UserIdentity; -use ParserOptions; /** * @internal diff --git a/includes/content/Transform/PreloadTransformParams.php b/includes/content/Transform/PreloadTransformParams.php index 92277904c663..4e30bad64d64 100644 --- a/includes/content/Transform/PreloadTransformParams.php +++ b/includes/content/Transform/PreloadTransformParams.php @@ -2,7 +2,7 @@ namespace MediaWiki\Content\Transform; use MediaWiki\Page\PageReference; -use ParserOptions; +use MediaWiki\Parser\ParserOptions; /** * @since 1.37 diff --git a/includes/content/Transform/PreloadTransformParamsValue.php b/includes/content/Transform/PreloadTransformParamsValue.php index f1f1fbeb2be2..5c55675d89c3 100644 --- a/includes/content/Transform/PreloadTransformParamsValue.php +++ b/includes/content/Transform/PreloadTransformParamsValue.php @@ -2,7 +2,7 @@ namespace MediaWiki\Content\Transform; use MediaWiki\Page\PageReference; -use ParserOptions; +use MediaWiki\Parser\ParserOptions; /** * @internal diff --git a/includes/content/WikitextContentHandler.php b/includes/content/WikitextContentHandler.php index ab5c56f90121..18879ea09af5 100644 --- a/includes/content/WikitextContentHandler.php +++ b/includes/content/WikitextContentHandler.php @@ -32,13 +32,13 @@ use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\Linker\LinkRenderer; use MediaWiki\Logger\LoggerFactory; use MediaWiki\Parser\MagicWordFactory; +use MediaWiki\Parser\ParserFactory; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\ParserOutputFlags; use MediaWiki\Parser\Parsoid\ParsoidParserFactory; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Title\Title; use MediaWiki\Title\TitleFactory; -use ParserFactory; use SearchEngine; use SearchIndexField; use Wikimedia\UUID\GlobalIdGenerator; diff --git a/includes/edit/PreparedEdit.php b/includes/edit/PreparedEdit.php index e2ee40bacb82..f2c2d2130df1 100644 --- a/includes/edit/PreparedEdit.php +++ b/includes/edit/PreparedEdit.php @@ -21,8 +21,8 @@ namespace MediaWiki\Edit; use MediaWiki\Content\Content; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; -use ParserOptions; use RuntimeException; /** diff --git a/includes/editpage/EditPage.php b/includes/editpage/EditPage.php index fac9c696bd9e..14bf603205b3 100644 --- a/includes/editpage/EditPage.php +++ b/includes/editpage/EditPage.php @@ -71,6 +71,7 @@ use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageReference; use MediaWiki\Page\RedirectLookup; use MediaWiki\Page\WikiPageFactory; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Permissions\Authority; use MediaWiki\Permissions\PermissionManager; @@ -103,7 +104,6 @@ use OOUI\ButtonWidget; use OOUI\CheckboxInputWidget; use OOUI\DropdownInputWidget; use OOUI\FieldLayout; -use ParserOptions; use PermissionsError; use ReadOnlyError; use RecentChange; diff --git a/includes/editpage/PreloadedContentBuilder.php b/includes/editpage/PreloadedContentBuilder.php index 25aee258c830..a45f9f4185c0 100644 --- a/includes/editpage/PreloadedContentBuilder.php +++ b/includes/editpage/PreloadedContentBuilder.php @@ -11,12 +11,12 @@ use MediaWiki\Page\PageReference; use MediaWiki\Page\ProperPageIdentity; use MediaWiki\Page\RedirectLookup; use MediaWiki\Page\WikiPageFactory; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Permissions\Authority; use MediaWiki\Revision\RevisionRecord; use MediaWiki\SpecialPage\SpecialPageFactory; use MediaWiki\Title\Title; use MessageCache; -use ParserOptions; use Wikimedia\Assert\Assert; /** diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index f99542d5c163..1822e6671f0d 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -48,6 +48,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\MainConfigSchema; use MediaWiki\MediaWikiServices; use MediaWiki\Parser\Parser; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Registration\ExtensionDependencyError; use MediaWiki\Registration\ExtensionProcessor; use MediaWiki\Registration\ExtensionRegistry; @@ -60,7 +61,6 @@ use MediaWiki\User\User; use MediaWiki\Utils\UrlUtils; use MWCryptRand; use MWLBFactory; -use ParserOptions; use RuntimeException; use Wikimedia\AtEase\AtEase; use Wikimedia\Message\MessageSpecifier; diff --git a/includes/page/Hook/ArticleParserOptionsHook.php b/includes/page/Hook/ArticleParserOptionsHook.php index 86976e0996ca..674987df3e4e 100644 --- a/includes/page/Hook/ArticleParserOptionsHook.php +++ b/includes/page/Hook/ArticleParserOptionsHook.php @@ -3,7 +3,7 @@ namespace MediaWiki\Page\Hook; use Article; -use ParserOptions; +use MediaWiki\Parser\ParserOptions; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/page/ParserOutputAccess.php b/includes/page/ParserOutputAccess.php index 3644f9cd6444..166b6bbddb1d 100644 --- a/includes/page/ParserOutputAccess.php +++ b/includes/page/ParserOutputAccess.php @@ -24,7 +24,9 @@ use MapCacheLRU; use MediaWiki\Logger\Spi as LoggerSpi; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Parser\ParserCache; use MediaWiki\Parser\ParserCacheFactory; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\Parsoid\PageBundleParserOutputConverter; use MediaWiki\Parser\RevisionOutputCache; @@ -39,8 +41,6 @@ use MediaWiki\Revision\SlotRecord; use MediaWiki\Status\Status; use MediaWiki\Title\TitleFormatter; use MediaWiki\WikiMap\WikiMap; -use ParserCache; -use ParserOptions; use Wikimedia\Assert\Assert; use Wikimedia\Parsoid\Parsoid; use Wikimedia\Rdbms\ChronologyProtector; diff --git a/includes/parser/BlockLevelPass.php b/includes/parser/BlockLevelPass.php index e4a661d47da0..24285efbf67c 100644 --- a/includes/parser/BlockLevelPass.php +++ b/includes/parser/BlockLevelPass.php @@ -23,6 +23,12 @@ * @ingroup Parser * @internal */ + +namespace MediaWiki\Parser; + +use LogicException; +use StringUtils; + class BlockLevelPass { /** @var bool */ private $DTopen = false; @@ -607,3 +613,6 @@ class BlockLevelPass { return false; } } + +/** @deprecated class alias since 1.43 */ +class_alias( BlockLevelPass::class, 'BlockLevelPass' ); diff --git a/includes/parser/CacheTime.php b/includes/parser/CacheTime.php index 37743083c10a..e4a00f92e71b 100644 --- a/includes/parser/CacheTime.php +++ b/includes/parser/CacheTime.php @@ -21,12 +21,13 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + use MediaWiki\Json\JsonDeserializable; use MediaWiki\Json\JsonDeserializableTrait; use MediaWiki\Json\JsonDeserializer; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; -use MediaWiki\Parser\ParserCacheMetadata; use MediaWiki\Utils\MWTimestamp; use Wikimedia\Reflection\GhostFieldAccessTrait; @@ -326,3 +327,6 @@ class CacheTime implements ParserCacheMetadata, JsonDeserializable { } } } + +/** @deprecated class alias since 1.43 */ +class_alias( CacheTime::class, 'CacheTime' ); diff --git a/includes/parser/CoreMagicVariables.php b/includes/parser/CoreMagicVariables.php index 1257c097a9b2..427fe9638b4b 100644 --- a/includes/parser/CoreMagicVariables.php +++ b/includes/parser/CoreMagicVariables.php @@ -20,9 +20,12 @@ * @file * @ingroup Parser */ + +namespace MediaWiki\Parser; + +use DateTime; use MediaWiki\Config\ServiceOptions; use MediaWiki\MainConfigNames; -use MediaWiki\Parser\Parser; use MediaWiki\Specials\SpecialVersion; use MediaWiki\Utils\MWTimestamp; use Psr\Log\LoggerInterface; @@ -362,3 +365,6 @@ class CoreMagicVariables { $parser->getOutput()->updateCacheExpiry( $ttl ); } } + +/** @deprecated class alias since 1.43 */ +class_alias( CoreMagicVariables::class, 'CoreMagicVariables' ); diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php index 8dbeedf52e98..444b1727672f 100644 --- a/includes/parser/CoreParserFunctions.php +++ b/includes/parser/CoreParserFunctions.php @@ -21,6 +21,9 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + +use InvalidArgumentException; use MediaWiki\Category\Category; use MediaWiki\Config\ServiceOptions; use MediaWiki\Language\Language; @@ -29,10 +32,6 @@ use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Message\Message; -use MediaWiki\Parser\MagicWordFactory; -use MediaWiki\Parser\Parser; -use MediaWiki\Parser\ParserOutputFlags; -use MediaWiki\Parser\Sanitizer; use MediaWiki\Revision\RevisionAccessException; use MediaWiki\Revision\RevisionRecord; use MediaWiki\SiteStats\SiteStats; @@ -1683,3 +1682,6 @@ class CoreParserFunctions { return ''; } } + +/** @deprecated class alias since 1.43 */ +class_alias( CoreParserFunctions::class, 'CoreParserFunctions' ); diff --git a/includes/parser/CoreTagHooks.php b/includes/parser/CoreTagHooks.php index 2282215def01..9372b8813778 100644 --- a/includes/parser/CoreTagHooks.php +++ b/includes/parser/CoreTagHooks.php @@ -21,13 +21,15 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + use MediaWiki\Config\ServiceOptions; use MediaWiki\Html\Html; use MediaWiki\Language\LanguageCode; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; -use MediaWiki\Parser\Parser; -use MediaWiki\Parser\Sanitizer; +use StringUtils; +use UnexpectedValueException; /** * Various tag hooks, registered in every Parser @@ -253,3 +255,6 @@ class CoreTagHooks { } } + +/** @deprecated class alias since 1.43 */ +class_alias( CoreTagHooks::class, 'CoreTagHooks' ); diff --git a/includes/parser/DateFormatter.php b/includes/parser/DateFormatter.php index f46143ea8221..0bb63f19281a 100644 --- a/includes/parser/DateFormatter.php +++ b/includes/parser/DateFormatter.php @@ -21,7 +21,10 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + use MediaWiki\Html\Html; +use MediaWiki\Language\Language; use MediaWiki\MediaWikiServices; /** @@ -316,3 +319,6 @@ class DateFormatter { return $text; } } + +/** @deprecated class alias since 1.43 */ +class_alias( DateFormatter::class, 'DateFormatter' ); diff --git a/includes/parser/DateFormatterFactory.php b/includes/parser/DateFormatterFactory.php index d18ecf41a333..e992461e99b2 100644 --- a/includes/parser/DateFormatterFactory.php +++ b/includes/parser/DateFormatterFactory.php @@ -1,5 +1,9 @@ <?php +namespace MediaWiki\Parser; + +use MediaWiki\Language\Language; + class DateFormatterFactory { /** @var DateFormatter[] */ private $instances; @@ -16,3 +20,6 @@ class DateFormatterFactory { return $this->instances[$code]; } } + +/** @deprecated class alias since 1.43 */ +class_alias( DateFormatterFactory::class, 'DateFormatterFactory' ); diff --git a/includes/parser/Hook/InternalParseBeforeLinksHook.php b/includes/parser/Hook/InternalParseBeforeLinksHook.php index b894d39f1aa3..ea90e324e93f 100644 --- a/includes/parser/Hook/InternalParseBeforeLinksHook.php +++ b/includes/parser/Hook/InternalParseBeforeLinksHook.php @@ -3,7 +3,7 @@ namespace MediaWiki\Hook; use MediaWiki\Parser\Parser; -use StripState; +use MediaWiki\Parser\StripState; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/parser/Hook/ParserAfterParseHook.php b/includes/parser/Hook/ParserAfterParseHook.php index 597a3d8c2705..b24d31f4a8b3 100644 --- a/includes/parser/Hook/ParserAfterParseHook.php +++ b/includes/parser/Hook/ParserAfterParseHook.php @@ -3,7 +3,7 @@ namespace MediaWiki\Hook; use MediaWiki\Parser\Parser; -use StripState; +use MediaWiki\Parser\StripState; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/parser/Hook/ParserBeforeInternalParseHook.php b/includes/parser/Hook/ParserBeforeInternalParseHook.php index dd06e7f43616..82b7553501a4 100644 --- a/includes/parser/Hook/ParserBeforeInternalParseHook.php +++ b/includes/parser/Hook/ParserBeforeInternalParseHook.php @@ -3,7 +3,7 @@ namespace MediaWiki\Hook; use MediaWiki\Parser\Parser; -use StripState; +use MediaWiki\Parser\StripState; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/parser/Hook/ParserBeforePreprocessHook.php b/includes/parser/Hook/ParserBeforePreprocessHook.php index 3780d2e8a4d8..6c61d7b6cc8d 100644 --- a/includes/parser/Hook/ParserBeforePreprocessHook.php +++ b/includes/parser/Hook/ParserBeforePreprocessHook.php @@ -3,7 +3,7 @@ namespace MediaWiki\Hook; use MediaWiki\Parser\Parser; -use StripState; +use MediaWiki\Parser\StripState; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/parser/Hook/ParserCacheSaveCompleteHook.php b/includes/parser/Hook/ParserCacheSaveCompleteHook.php index c878d8a746f6..2a961be4b573 100644 --- a/includes/parser/Hook/ParserCacheSaveCompleteHook.php +++ b/includes/parser/Hook/ParserCacheSaveCompleteHook.php @@ -2,10 +2,10 @@ namespace MediaWiki\Hook; +use MediaWiki\Parser\ParserCache; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Title\Title; -use ParserCache; -use ParserOptions; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/parser/Hook/ParserGetVariableValueSwitchHook.php b/includes/parser/Hook/ParserGetVariableValueSwitchHook.php index 550b3c34ad20..733431bcc45f 100644 --- a/includes/parser/Hook/ParserGetVariableValueSwitchHook.php +++ b/includes/parser/Hook/ParserGetVariableValueSwitchHook.php @@ -3,7 +3,7 @@ namespace MediaWiki\Hook; use MediaWiki\Parser\Parser; -use PPFrame; +use MediaWiki\Parser\PPFrame; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/parser/Hook/RejectParserCacheValueHook.php b/includes/parser/Hook/RejectParserCacheValueHook.php index 03fbae4efcb8..aec164a2d4c7 100644 --- a/includes/parser/Hook/RejectParserCacheValueHook.php +++ b/includes/parser/Hook/RejectParserCacheValueHook.php @@ -2,8 +2,8 @@ namespace MediaWiki\Hook; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; -use ParserOptions; use WikiPage; /** diff --git a/includes/parser/LinkHolderArray.php b/includes/parser/LinkHolderArray.php index 7946ed882960..0d763484d9e7 100644 --- a/includes/parser/LinkHolderArray.php +++ b/includes/parser/LinkHolderArray.php @@ -21,6 +21,9 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + +use HtmlArmor; use MediaWiki\Cache\LinkCache; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; @@ -28,8 +31,6 @@ use MediaWiki\Language\ILanguageConverter; use MediaWiki\Linker\Linker; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; -use MediaWiki\Parser\Parser; -use MediaWiki\Parser\Sanitizer; use MediaWiki\Title\Title; /** @@ -496,3 +497,6 @@ class LinkHolderArray { ); } } + +/** @deprecated class alias since 1.43 */ +class_alias( LinkHolderArray::class, 'LinkHolderArray' ); diff --git a/includes/parser/MWTidy.php b/includes/parser/MWTidy.php index b44631132f8f..7c1e4cabfb06 100644 --- a/includes/parser/MWTidy.php +++ b/includes/parser/MWTidy.php @@ -21,6 +21,8 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + use MediaWiki\MediaWikiServices; /** @@ -43,3 +45,6 @@ class MWTidy { return MediaWikiServices::getInstance()->getTidy()->tidy( $text ); } } + +/** @deprecated class alias since 1.43 */ +class_alias( MWTidy::class, 'MWTidy' ); diff --git a/includes/parser/PPCustomFrame_Hash.php b/includes/parser/PPCustomFrame_Hash.php index 298634588754..38b451367681 100644 --- a/includes/parser/PPCustomFrame_Hash.php +++ b/includes/parser/PPCustomFrame_Hash.php @@ -19,6 +19,8 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + /** * Expansion frame with custom arguments * @ingroup Parser @@ -73,3 +75,6 @@ class PPCustomFrame_Hash extends PPFrame_Hash { return $this->args; } } + +/** @deprecated class alias since 1.43 */ +class_alias( PPCustomFrame_Hash::class, 'PPCustomFrame_Hash' ); diff --git a/includes/parser/PPDPart_Hash.php b/includes/parser/PPDPart_Hash.php index 9a36dc554066..5f4e50a6dfae 100644 --- a/includes/parser/PPDPart_Hash.php +++ b/includes/parser/PPDPart_Hash.php @@ -19,6 +19,8 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + /** * @ingroup Parser */ @@ -52,3 +54,6 @@ class PPDPart_Hash { } } } + +/** @deprecated class alias since 1.43 */ +class_alias( PPDPart_Hash::class, 'PPDPart_Hash' ); diff --git a/includes/parser/PPDStackElement_Hash.php b/includes/parser/PPDStackElement_Hash.php index b758b2bdc452..06d48b95be39 100644 --- a/includes/parser/PPDStackElement_Hash.php +++ b/includes/parser/PPDStackElement_Hash.php @@ -19,6 +19,8 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + /** * @ingroup Parser * @@ -147,3 +149,6 @@ class PPDStackElement_Hash { return $accum; } } + +/** @deprecated class alias since 1.43 */ +class_alias( PPDStackElement_Hash::class, 'PPDStackElement_Hash' ); diff --git a/includes/parser/PPDStack_Hash.php b/includes/parser/PPDStack_Hash.php index ededf4bfcaca..386f75a86882 100644 --- a/includes/parser/PPDStack_Hash.php +++ b/includes/parser/PPDStack_Hash.php @@ -19,6 +19,10 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + +use RuntimeException; + /** * Stack class to help Preprocessor::preprocessToObj() * @ingroup Parser @@ -117,3 +121,6 @@ class PPDStack_Hash { } } } + +/** @deprecated class alias since 1.43 */ +class_alias( PPDStack_Hash::class, 'PPDStack_Hash' ); diff --git a/includes/parser/PPFrame.php b/includes/parser/PPFrame.php index 1eebed9a9185..cdda5191dd84 100644 --- a/includes/parser/PPFrame.php +++ b/includes/parser/PPFrame.php @@ -19,6 +19,8 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + use MediaWiki\Title\Title; /** @@ -205,3 +207,6 @@ interface PPFrame { */ public function getTitle(); } + +/** @deprecated class alias since 1.43 */ +class_alias( PPFrame::class, 'PPFrame' ); diff --git a/includes/parser/PPFrame_Hash.php b/includes/parser/PPFrame_Hash.php index 82ad89320f59..2e9f2b7f2cc0 100644 --- a/includes/parser/PPFrame_Hash.php +++ b/includes/parser/PPFrame_Hash.php @@ -19,9 +19,13 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + +use InvalidArgumentException; use MediaWiki\Message\Message; -use MediaWiki\Parser\Parser; use MediaWiki\Title\Title; +use RuntimeException; +use Stringable; /** * An expansion frame, used as a context to expand the result of preprocessToObj() @@ -637,3 +641,6 @@ class PPFrame_Hash implements Stringable, PPFrame { return $this->ttl; } } + +/** @deprecated class alias since 1.43 */ +class_alias( PPFrame_Hash::class, 'PPFrame_Hash' ); diff --git a/includes/parser/PPNode.php b/includes/parser/PPNode.php index 40801ee5d405..a33b9daaafb7 100644 --- a/includes/parser/PPNode.php +++ b/includes/parser/PPNode.php @@ -19,6 +19,8 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + /** * There are three types of nodes: * * Tree nodes, which have a name and contain other nodes as children @@ -110,3 +112,6 @@ interface PPNode { */ public function splitHeading(); } + +/** @deprecated class alias since 1.43 */ +class_alias( PPNode::class, 'PPNode' ); diff --git a/includes/parser/PPNode_Hash_Array.php b/includes/parser/PPNode_Hash_Array.php index d7dc0b2cdace..ac405e5497e7 100644 --- a/includes/parser/PPNode_Hash_Array.php +++ b/includes/parser/PPNode_Hash_Array.php @@ -19,6 +19,11 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + +use LogicException; +use Stringable; + /** * @ingroup Parser */ @@ -82,3 +87,6 @@ class PPNode_Hash_Array implements Stringable, PPNode { throw new LogicException( __METHOD__ . ': not supported' ); } } + +/** @deprecated class alias since 1.43 */ +class_alias( PPNode_Hash_Array::class, 'PPNode_Hash_Array' ); diff --git a/includes/parser/PPNode_Hash_Attr.php b/includes/parser/PPNode_Hash_Attr.php index fc5edcf84547..69f063eb574f 100644 --- a/includes/parser/PPNode_Hash_Attr.php +++ b/includes/parser/PPNode_Hash_Attr.php @@ -19,6 +19,12 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + +use InvalidArgumentException; +use LogicException; +use Stringable; + /** * @ingroup Parser */ @@ -99,3 +105,6 @@ class PPNode_Hash_Attr implements Stringable, PPNode { throw new LogicException( __METHOD__ . ': not supported' ); } } + +/** @deprecated class alias since 1.43 */ +class_alias( PPNode_Hash_Attr::class, 'PPNode_Hash_Attr' ); diff --git a/includes/parser/PPNode_Hash_Text.php b/includes/parser/PPNode_Hash_Text.php index bbee6a16c7d1..63854da01f19 100644 --- a/includes/parser/PPNode_Hash_Text.php +++ b/includes/parser/PPNode_Hash_Text.php @@ -19,6 +19,12 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + +use InvalidArgumentException; +use LogicException; +use Stringable; + /** * @ingroup Parser */ @@ -95,3 +101,6 @@ class PPNode_Hash_Text implements Stringable, PPNode { throw new LogicException( __METHOD__ . ': not supported' ); } } + +/** @deprecated class alias since 1.43 */ +class_alias( PPNode_Hash_Text::class, 'PPNode_Hash_Text' ); diff --git a/includes/parser/PPNode_Hash_Tree.php b/includes/parser/PPNode_Hash_Tree.php index bab386fa3669..b7bec7775256 100644 --- a/includes/parser/PPNode_Hash_Tree.php +++ b/includes/parser/PPNode_Hash_Tree.php @@ -19,6 +19,12 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + +use BadMethodCallException; +use InvalidArgumentException; +use Stringable; + /** * @ingroup Parser */ @@ -368,3 +374,6 @@ class PPNode_Hash_Tree implements Stringable, PPNode { return $bits; } } + +/** @deprecated class alias since 1.43 */ +class_alias( PPNode_Hash_Tree::class, 'PPNode_Hash_Tree' ); diff --git a/includes/parser/PPTemplateFrame_Hash.php b/includes/parser/PPTemplateFrame_Hash.php index e5da1b1043f6..ffa3e9d4d8fd 100644 --- a/includes/parser/PPTemplateFrame_Hash.php +++ b/includes/parser/PPTemplateFrame_Hash.php @@ -19,6 +19,8 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + use MediaWiki\Title\Title; /** @@ -211,3 +213,6 @@ class PPTemplateFrame_Hash extends PPFrame_Hash { $this->parent->setTTL( $ttl ); } } + +/** @deprecated class alias since 1.43 */ +class_alias( PPTemplateFrame_Hash::class, 'PPTemplateFrame_Hash' ); diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index 4074281ec5d8..c598e65b1a99 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -24,17 +24,12 @@ namespace MediaWiki\Parser; use BadMethodCallException; -use BlockLevelPass; -use CoreMagicVariables; -use CoreParserFunctions; -use CoreTagHooks; use Exception; use File; use HtmlArmor; use ImageGalleryBase; use ImageGalleryClassNotFoundException; use InvalidArgumentException; -use LinkHolderArray; use LogicException; use MapCacheLRU; use MediaHandler; @@ -86,17 +81,10 @@ use MediaWiki\User\UserNameUtils; use MediaWiki\Utils\MWTimestamp; use MediaWiki\Utils\UrlUtils; use MediaWiki\Xml\Xml; -use ParserFactory; -use ParserOptions; -use PPFrame; -use PPNode; -use Preprocessor; -use Preprocessor_Hash; use Psr\Log\LoggerInterface; use RuntimeException; use SectionProfiler; use StringUtils; -use StripState; use UnexpectedValueException; use Wikimedia\Bcp47Code\Bcp47CodeValue; use Wikimedia\IPUtils; diff --git a/includes/parser/ParserCache.php b/includes/parser/ParserCache.php index b8d282d7db59..9178e073da62 100644 --- a/includes/parser/ParserCache.php +++ b/includes/parser/ParserCache.php @@ -21,14 +21,16 @@ * @ingroup Cache Parser */ +namespace MediaWiki\Parser; + +use Exception; +use InvalidArgumentException; +use JsonException; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Json\JsonCodec; 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; use Wikimedia\ObjectCache\BagOStuff; @@ -739,3 +741,6 @@ class ParserCache { } } } + +/** @deprecated class alias since 1.43 */ +class_alias( ParserCache::class, 'ParserCache' ); diff --git a/includes/parser/ParserCacheFactory.php b/includes/parser/ParserCacheFactory.php index 9288dfafdd89..a96d22bc8b6d 100644 --- a/includes/parser/ParserCacheFactory.php +++ b/includes/parser/ParserCacheFactory.php @@ -27,7 +27,6 @@ use MediaWiki\Json\JsonCodec; use MediaWiki\MainConfigNames; use MediaWiki\Page\WikiPageFactory; use MediaWiki\Title\TitleFactory; -use ParserCache; use Psr\Log\LoggerInterface; use Wikimedia\ObjectCache\BagOStuff; use Wikimedia\ObjectCache\WANObjectCache; diff --git a/includes/parser/ParserCacheFilter.php b/includes/parser/ParserCacheFilter.php index babb2f7aa52e..187b94f1e920 100644 --- a/includes/parser/ParserCacheFilter.php +++ b/includes/parser/ParserCacheFilter.php @@ -22,7 +22,6 @@ namespace MediaWiki\Parser; use MediaWiki\Page\PageRecord; -use ParserOptions; /** * Filter that decides whether a ParserOutput object should be stored in the diff --git a/includes/parser/ParserFactory.php b/includes/parser/ParserFactory.php index 2c770e46c6bb..b8db2e3fa001 100644 --- a/includes/parser/ParserFactory.php +++ b/includes/parser/ParserFactory.php @@ -19,16 +19,17 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + use MediaWiki\Category\TrackingCategories; use MediaWiki\Config\ServiceOptions; use MediaWiki\HookContainer\HookContainer; use MediaWiki\Http\HttpRequestFactory; +use MediaWiki\Language\Language; use MediaWiki\Languages\LanguageConverterFactory; use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\Linker\LinkRendererFactory; use MediaWiki\Page\File\BadFileLookup; -use MediaWiki\Parser\MagicWordFactory; -use MediaWiki\Parser\Parser; use MediaWiki\Preferences\SignatureValidatorFactory; use MediaWiki\SpecialPage\SpecialPageFactory; use MediaWiki\Tidy\TidyDriverBase; @@ -277,3 +278,6 @@ class ParserFactory { } } + +/** @deprecated class alias since 1.43 */ +class_alias( ParserFactory::class, 'ParserFactory' ); diff --git a/includes/parser/ParserObserver.php b/includes/parser/ParserObserver.php index fcafc53556ab..7655641b0132 100644 --- a/includes/parser/ParserObserver.php +++ b/includes/parser/ParserObserver.php @@ -33,7 +33,6 @@ use MediaWiki\Cache\CacheKeyHelper; use MediaWiki\Content\Content; use MediaWiki\Page\PageReference; use MediaWiki\Title\Title; -use ParserOptions; use Psr\Log\LoggerInterface; use RuntimeException; diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php index 559bb0b10ab5..a11e94f155bd 100644 --- a/includes/parser/ParserOptions.php +++ b/includes/parser/ParserOptions.php @@ -21,12 +21,16 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + +use InvalidArgumentException; +use LogicException; +use MediaWiki\Content\Content; use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Language\Language; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; -use MediaWiki\Parser\Parser; use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\SlotRecord; use MediaWiki\StubObject\StubObject; @@ -34,6 +38,7 @@ use MediaWiki\Title\Title; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserIdentityValue; use MediaWiki\Utils\MWTimestamp; +use ReflectionClass; use Wikimedia\IPUtils; use Wikimedia\ScopedCallback; @@ -1584,6 +1589,9 @@ class ParserOptions { } } +/** @deprecated class alias since 1.43 */ +class_alias( ParserOptions::class, 'ParserOptions' ); + /** * For really cool vim folding this needs to be at the end: * vim: foldmarker=@{,@} foldmethod=marker diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php index eec98f760e61..a941c4f247b1 100644 --- a/includes/parser/ParserOutput.php +++ b/includes/parser/ParserOutput.php @@ -20,7 +20,6 @@ namespace MediaWiki\Parser; -use CacheTime; use InvalidArgumentException; use LogicException; use MediaWiki\Edit\ParsoidRenderID; @@ -34,7 +33,6 @@ use MediaWiki\Output\OutputPage; use MediaWiki\Parser\Parsoid\PageBundleParserOutputConverter; use MediaWiki\Title\Title; use MediaWiki\Title\TitleValue; -use ParserOptions; use UnexpectedValueException; use Wikimedia\Bcp47Code\Bcp47Code; use Wikimedia\Bcp47Code\Bcp47CodeValue; diff --git a/includes/parser/Parsoid/Config/DataAccess.php b/includes/parser/Parsoid/Config/DataAccess.php index 6b958ffd23d2..ac4b05e13bfc 100644 --- a/includes/parser/Parsoid/Config/DataAccess.php +++ b/includes/parser/Parsoid/Config/DataAccess.php @@ -33,9 +33,9 @@ use MediaWiki\Linker\Linker; use MediaWiki\MainConfigNames; use MediaWiki\Page\File\BadFileLookup; use MediaWiki\Parser\Parser; +use MediaWiki\Parser\ParserFactory; +use MediaWiki\Parser\PPFrame; use MediaWiki\Title\Title; -use ParserFactory; -use PPFrame; use RepoGroup; use Wikimedia\Assert\UnreachableException; use Wikimedia\Parsoid\Config\DataAccess as IDataAccess; diff --git a/includes/parser/Parsoid/Config/PageConfig.php b/includes/parser/Parsoid/Config/PageConfig.php index 78c3040ccb42..f99028e0911a 100644 --- a/includes/parser/Parsoid/Config/PageConfig.php +++ b/includes/parser/Parsoid/Config/PageConfig.php @@ -19,11 +19,11 @@ namespace MediaWiki\Parser\Parsoid\Config; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; use MediaWiki\Revision\SlotRoleHandler; use MediaWiki\Title\Title; -use ParserOptions; use Wikimedia\Bcp47Code\Bcp47Code; use Wikimedia\Parsoid\Config\PageConfig as IPageConfig; use Wikimedia\Parsoid\Config\PageContent as IPageContent; diff --git a/includes/parser/Parsoid/Config/PageConfigFactory.php b/includes/parser/Parsoid/Config/PageConfigFactory.php index 3c8ad5311752..e15610114294 100644 --- a/includes/parser/Parsoid/Config/PageConfigFactory.php +++ b/includes/parser/Parsoid/Config/PageConfigFactory.php @@ -22,6 +22,7 @@ namespace MediaWiki\Parser\Parsoid\Config; use MediaWiki\Languages\LanguageFactory; use MediaWiki\Logger\LoggerFactory; use MediaWiki\Page\PageIdentity; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Revision\RevisionAccessException; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionStore; @@ -30,7 +31,6 @@ use MediaWiki\Revision\SlotRoleRegistry; use MediaWiki\Revision\SuppressedDataException; use MediaWiki\Title\Title; use MediaWiki\User\UserIdentity; -use ParserOptions; use Wikimedia\Bcp47Code\Bcp47Code; use Wikimedia\Rdbms\IDBAccessObject; diff --git a/includes/parser/Parsoid/Config/SiteConfig.php b/includes/parser/Parsoid/Config/SiteConfig.php index dfe583db20d8..d038f2c4d519 100644 --- a/includes/parser/Parsoid/Config/SiteConfig.php +++ b/includes/parser/Parsoid/Config/SiteConfig.php @@ -37,6 +37,7 @@ use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; use MediaWiki\Parser\MagicWordArray; use MediaWiki\Parser\MagicWordFactory; +use MediaWiki\Parser\ParserFactory; use MediaWiki\Parser\ParserOutput; use MediaWiki\SpecialPage\SpecialPageFactory; use MediaWiki\Title\NamespaceInfo; @@ -45,7 +46,6 @@ use MediaWiki\User\Options\UserOptionsLookup; use MediaWiki\Utils\UrlUtils; use MediaWiki\WikiMap\WikiMap; use MWUnknownContentModelException; -use ParserFactory; use Psr\Log\LoggerInterface; use UnexpectedValueException; use Wikimedia\Bcp47Code\Bcp47Code; diff --git a/includes/parser/Parsoid/ParsoidOutputAccess.php b/includes/parser/Parsoid/ParsoidOutputAccess.php index 2a57d7491b5a..ac6d41b14b3b 100644 --- a/includes/parser/Parsoid/ParsoidOutputAccess.php +++ b/includes/parser/Parsoid/ParsoidOutputAccess.php @@ -25,6 +25,7 @@ use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageLookup; use MediaWiki\Page\PageRecord; use MediaWiki\Page\ParserOutputAccess; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\Parsoid\Config\SiteConfig; use MediaWiki\Revision\RevisionAccessException; @@ -32,7 +33,6 @@ use MediaWiki\Revision\RevisionLookup; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; use MediaWiki\Status\Status; -use ParserOptions; use Wikimedia\Parsoid\Core\ClientError; use Wikimedia\Parsoid\Core\ResourceLimitExceededException; diff --git a/includes/parser/Parsoid/ParsoidParser.php b/includes/parser/Parsoid/ParsoidParser.php index 57d49480aee2..a897578bdc5b 100644 --- a/includes/parser/Parsoid/ParsoidParser.php +++ b/includes/parser/Parsoid/ParsoidParser.php @@ -8,14 +8,14 @@ use MediaWiki\Languages\LanguageConverterFactory; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageReference; +use MediaWiki\Parser\ParserFactory; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\Parsoid\Config\PageConfigFactory; use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; use MediaWiki\Title\Title; -use ParserFactory; -use ParserOptions; use Wikimedia\Assert\Assert; use Wikimedia\Parsoid\Config\PageConfig; use Wikimedia\Parsoid\Parsoid; diff --git a/includes/parser/Parsoid/ParsoidParserFactory.php b/includes/parser/Parsoid/ParsoidParserFactory.php index 63cd7c4f21ef..e62f1a7c2a8c 100644 --- a/includes/parser/Parsoid/ParsoidParserFactory.php +++ b/includes/parser/Parsoid/ParsoidParserFactory.php @@ -3,8 +3,8 @@ namespace MediaWiki\Parser\Parsoid; use MediaWiki\Languages\LanguageConverterFactory; +use MediaWiki\Parser\ParserFactory; use MediaWiki\Parser\Parsoid\Config\PageConfigFactory; -use ParserFactory; use Wikimedia\Parsoid\Config\DataAccess; use Wikimedia\Parsoid\Config\SiteConfig; use Wikimedia\Parsoid\Parsoid; diff --git a/includes/parser/Preprocessor.php b/includes/parser/Preprocessor.php index 9f003c74eb46..5fa8ca76d685 100644 --- a/includes/parser/Preprocessor.php +++ b/includes/parser/Preprocessor.php @@ -21,7 +21,8 @@ * @ingroup Parser */ -use MediaWiki\Parser\Parser; +namespace MediaWiki\Parser; + use Wikimedia\ObjectCache\WANObjectCache; /** @@ -147,3 +148,6 @@ abstract class Preprocessor { */ abstract public function preprocessToObj( $text, $flags = 0 ); } + +/** @deprecated class alias since 1.43 */ +class_alias( Preprocessor::class, 'Preprocessor' ); diff --git a/includes/parser/Preprocessor_Hash.php b/includes/parser/Preprocessor_Hash.php index e37505aa6ed1..34f63f92e5b2 100644 --- a/includes/parser/Preprocessor_Hash.php +++ b/includes/parser/Preprocessor_Hash.php @@ -21,7 +21,8 @@ * @ingroup Parser */ -use MediaWiki\Parser\Parser; +namespace MediaWiki\Parser; + use Wikimedia\ObjectCache\WANObjectCache; /** @@ -811,3 +812,6 @@ class Preprocessor_Hash extends Preprocessor { } } } + +/** @deprecated class alias since 1.43 */ +class_alias( Preprocessor_Hash::class, 'Preprocessor_Hash' ); diff --git a/includes/parser/RevisionOutputCache.php b/includes/parser/RevisionOutputCache.php index 34eccfdabdcf..4ac71df853fb 100644 --- a/includes/parser/RevisionOutputCache.php +++ b/includes/parser/RevisionOutputCache.php @@ -23,13 +23,11 @@ namespace MediaWiki\Parser; -use CacheTime; use InvalidArgumentException; use JsonException; use MediaWiki\Json\JsonCodec; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Utils\MWTimestamp; -use ParserOptions; use Psr\Log\LoggerInterface; use Wikimedia\ObjectCache\WANObjectCache; use Wikimedia\Stats\StatsFactory; diff --git a/includes/parser/StripState.php b/includes/parser/StripState.php index 2a57fb8348f7..354cbfd40555 100644 --- a/includes/parser/StripState.php +++ b/includes/parser/StripState.php @@ -21,7 +21,10 @@ * @ingroup Parser */ -use MediaWiki\Parser\Parser; +namespace MediaWiki\Parser; + +use Closure; +use InvalidArgumentException; /** * @todo document, briefly. @@ -277,3 +280,6 @@ class StripState { return preg_replace( $this->regex, '', $text ); } } + +/** @deprecated class alias since 1.43 */ +class_alias( StripState::class, 'StripState' ); diff --git a/includes/poolcounter/PoolWorkArticleView.php b/includes/poolcounter/PoolWorkArticleView.php index 42803b4cc34c..16d077ad85f5 100644 --- a/includes/poolcounter/PoolWorkArticleView.php +++ b/includes/poolcounter/PoolWorkArticleView.php @@ -23,13 +23,13 @@ namespace MediaWiki\PoolCounter; use MediaWiki\Logger\Spi as LoggerSpi; use MediaWiki\MediaWikiServices; use MediaWiki\Page\ParserOutputAccess; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionRenderer; use MediaWiki\Revision\SlotRecord; use MediaWiki\Status\Status; use MediaWiki\WikiMap\WikiMap; -use ParserOptions; /** * PoolCounter protected work wrapping RenderedRevision->getRevisionParserOutput. diff --git a/includes/poolcounter/PoolWorkArticleViewCurrent.php b/includes/poolcounter/PoolWorkArticleViewCurrent.php index 7aec7d0d81d3..b8320f9ba1f5 100644 --- a/includes/poolcounter/PoolWorkArticleViewCurrent.php +++ b/includes/poolcounter/PoolWorkArticleViewCurrent.php @@ -26,13 +26,13 @@ use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Page\PageRecord; use MediaWiki\Page\WikiPageFactory; +use MediaWiki\Parser\ParserCache; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionRenderer; use MediaWiki\Status\Status; use MediaWiki\Utils\MWTimestamp; -use ParserCache; -use ParserOptions; use Wikimedia\Rdbms\ChronologyProtector; use Wikimedia\Rdbms\ILBFactory; diff --git a/includes/poolcounter/PoolWorkArticleViewOld.php b/includes/poolcounter/PoolWorkArticleViewOld.php index 18c6eaf50a8f..516dac359d40 100644 --- a/includes/poolcounter/PoolWorkArticleViewOld.php +++ b/includes/poolcounter/PoolWorkArticleViewOld.php @@ -23,12 +23,12 @@ namespace MediaWiki\PoolCounter; use MediaWiki\Logger\Spi as LoggerSpi; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\RevisionOutputCache; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionRenderer; use MediaWiki\Status\Status; -use ParserOptions; /** * PoolWorkArticleView for an old revision of a page, using a simple cache. diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php index d161cef26f01..b0e42902e332 100644 --- a/includes/preferences/DefaultPreferencesFactory.php +++ b/includes/preferences/DefaultPreferencesFactory.php @@ -45,6 +45,8 @@ use MediaWiki\MediaWikiServices; use MediaWiki\Message\Message; use MediaWiki\Output\OutputPage; use MediaWiki\Parser\Parser; +use MediaWiki\Parser\ParserFactory; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Permissions\PermissionManager; use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\Specials\SpecialWatchlist; @@ -63,8 +65,6 @@ use OOUI\ButtonWidget; use OOUI\FieldLayout; use OOUI\HtmlSnippet; use OOUI\LabelWidget; -use ParserFactory; -use ParserOptions; use PreferencesFormOOUI; use Psr\Log\LoggerAwareTrait; use Psr\Log\NullLogger; diff --git a/includes/preferences/SignatureValidator.php b/includes/preferences/SignatureValidator.php index 6bd874bd23c4..bee010e328db 100644 --- a/includes/preferences/SignatureValidator.php +++ b/includes/preferences/SignatureValidator.php @@ -23,6 +23,8 @@ namespace MediaWiki\Preferences; use MediaWiki\Config\ServiceOptions; use MediaWiki\Html\Html; use MediaWiki\MainConfigNames; +use MediaWiki\Parser\ParserFactory; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutputFlags; use MediaWiki\Parser\Parsoid\LintErrorChecker; use MediaWiki\SpecialPage\SpecialPage; @@ -31,8 +33,6 @@ use MediaWiki\Title\TitleFactory; use MediaWiki\User\UserIdentity; use MessageLocalizer; use OOUI\ButtonWidget; -use ParserFactory; -use ParserOptions; /** * @since 1.35 diff --git a/includes/preferences/SignatureValidatorFactory.php b/includes/preferences/SignatureValidatorFactory.php index e1cc90be0715..60a2ea3c464a 100644 --- a/includes/preferences/SignatureValidatorFactory.php +++ b/includes/preferences/SignatureValidatorFactory.php @@ -22,11 +22,11 @@ namespace MediaWiki\Preferences; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Parser\ParserOptions; use MediaWiki\SpecialPage\SpecialPageFactory; use MediaWiki\Title\TitleFactory; use MediaWiki\User\UserIdentity; use MessageLocalizer; -use ParserOptions; /** * @since 1.38 diff --git a/includes/specials/SpecialExpandTemplates.php b/includes/specials/SpecialExpandTemplates.php index a5029bf8f607..d6a3424965dd 100644 --- a/includes/specials/SpecialExpandTemplates.php +++ b/includes/specials/SpecialExpandTemplates.php @@ -26,6 +26,8 @@ use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Output\OutputPage; use MediaWiki\Parser\Parser; +use MediaWiki\Parser\ParserFactory; +use MediaWiki\Parser\ParserOptions; use MediaWiki\Parser\ParserOutput; use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\Status\Status; @@ -33,8 +35,6 @@ use MediaWiki\Tidy\TidyDriverBase; use MediaWiki\Title\Title; use MediaWiki\User\Options\UserOptionsLookup; use MediaWiki\Xml\Xml; -use ParserFactory; -use ParserOptions; /** * A special page to enter wikitext and expands its templates, parser functions, diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php index 6279b86d1434..6b6bf661376e 100644 --- a/includes/specials/SpecialVersion.php +++ b/includes/specials/SpecialVersion.php @@ -33,6 +33,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Message\Message; use MediaWiki\Parser\Parser; +use MediaWiki\Parser\ParserFactory; use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\ParserOutputFlags; use MediaWiki\Parser\Sanitizer; @@ -42,7 +43,6 @@ use MediaWiki\Utils\ExtensionInfo; use MediaWiki\Utils\GitInfo; use MediaWiki\Utils\MWTimestamp; use MediaWiki\Utils\UrlUtils; -use ParserFactory; use Symfony\Component\Yaml\Yaml; use Wikimedia\Composer\ComposerInstalled; use Wikimedia\Parsoid\Core\SectionMetadata; |