diff options
author | Subramanya Sastry <ssastry@wikimedia.org> | 2023-12-13 16:50:44 -0600 |
---|---|---|
committer | James D. Forrester <jforrester@wikimedia.org> | 2024-02-16 09:18:38 -0500 |
commit | e55cc517da18c241d4440fa6b50d16190a84e82e (patch) | |
tree | 8d384eb9754a5e67e801a07b3aa707ca75d38ff0 /includes/parser | |
parent | ed6440d9bac2e60e8854810d024fbfc73070e57f (diff) | |
download | mediawikicore-e55cc517da18c241d4440fa6b50d16190a84e82e.tar.gz mediawikicore-e55cc517da18c241d4440fa6b50d16190a84e82e.zip |
Move Parser to Mediawiki\Parser namespace
Bug: T166010
Co-Authored-By: Daimona Eaytoy <daimona.wiki@gmail.com>
Co-Authored-By: James Forrester <jforrester@wikimedia.org>
Co-Authored-By: Subramanya Sastry <ssastry@wikimedia.org>
Change-Id: I79b4e732c45095eedbaa80afa5eb7479b387ed8a
Diffstat (limited to 'includes/parser')
29 files changed, 73 insertions, 24 deletions
diff --git a/includes/parser/CoreMagicVariables.php b/includes/parser/CoreMagicVariables.php index b84de25ceb48..b18061a1f723 100644 --- a/includes/parser/CoreMagicVariables.php +++ b/includes/parser/CoreMagicVariables.php @@ -22,6 +22,7 @@ */ use MediaWiki\Config\ServiceOptions; use MediaWiki\MainConfigNames; +use MediaWiki\Parser\Parser; use MediaWiki\Specials\SpecialVersion; use MediaWiki\Utils\MWTimestamp; use Psr\Log\LoggerInterface; diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php index 69cba69d9eaf..03d6078d8046 100644 --- a/includes/parser/CoreParserFunctions.php +++ b/includes/parser/CoreParserFunctions.php @@ -26,6 +26,7 @@ use MediaWiki\Config\ServiceOptions; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Parser\MagicWordFactory; +use MediaWiki\Parser\Parser; use MediaWiki\Parser\ParserOutputFlags; use MediaWiki\Parser\Sanitizer; use MediaWiki\Revision\RevisionAccessException; diff --git a/includes/parser/CoreTagHooks.php b/includes/parser/CoreTagHooks.php index 9870abc573f8..ef47d347617d 100644 --- a/includes/parser/CoreTagHooks.php +++ b/includes/parser/CoreTagHooks.php @@ -25,6 +25,7 @@ use MediaWiki\Config\ServiceOptions; use MediaWiki\Html\Html; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Parser\Parser; use MediaWiki\Parser\Sanitizer; /** diff --git a/includes/parser/Hook/AfterParserFetchFileAndTitleHook.php b/includes/parser/Hook/AfterParserFetchFileAndTitleHook.php index 4c286a23b2cb..c23655078bde 100644 --- a/includes/parser/Hook/AfterParserFetchFileAndTitleHook.php +++ b/includes/parser/Hook/AfterParserFetchFileAndTitleHook.php @@ -3,7 +3,7 @@ namespace MediaWiki\Hook; use ImageGalleryBase; -use Parser; +use MediaWiki\Parser\Parser; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/parser/Hook/BeforeParserFetchFileAndTitleHook.php b/includes/parser/Hook/BeforeParserFetchFileAndTitleHook.php index e08f75b4dcfe..288c3b8fe5bd 100644 --- a/includes/parser/Hook/BeforeParserFetchFileAndTitleHook.php +++ b/includes/parser/Hook/BeforeParserFetchFileAndTitleHook.php @@ -2,8 +2,8 @@ namespace MediaWiki\Hook; +use MediaWiki\Parser\Parser; use MediaWiki\Title\Title; -use Parser; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/parser/Hook/InternalParseBeforeLinksHook.php b/includes/parser/Hook/InternalParseBeforeLinksHook.php index 5e2b54871d85..b894d39f1aa3 100644 --- a/includes/parser/Hook/InternalParseBeforeLinksHook.php +++ b/includes/parser/Hook/InternalParseBeforeLinksHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Hook; -use Parser; +use MediaWiki\Parser\Parser; use StripState; /** diff --git a/includes/parser/Hook/ParserAfterParseHook.php b/includes/parser/Hook/ParserAfterParseHook.php index 2e8ca005255b..597a3d8c2705 100644 --- a/includes/parser/Hook/ParserAfterParseHook.php +++ b/includes/parser/Hook/ParserAfterParseHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Hook; -use Parser; +use MediaWiki\Parser\Parser; use StripState; /** diff --git a/includes/parser/Hook/ParserAfterTidyHook.php b/includes/parser/Hook/ParserAfterTidyHook.php index 9359e8bfe40d..2956a6668f4c 100644 --- a/includes/parser/Hook/ParserAfterTidyHook.php +++ b/includes/parser/Hook/ParserAfterTidyHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Hook; -use Parser; +use MediaWiki\Parser\Parser; /** * 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 9346747e4d97..dd06e7f43616 100644 --- a/includes/parser/Hook/ParserBeforeInternalParseHook.php +++ b/includes/parser/Hook/ParserBeforeInternalParseHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Hook; -use Parser; +use MediaWiki\Parser\Parser; use StripState; /** diff --git a/includes/parser/Hook/ParserBeforePreprocessHook.php b/includes/parser/Hook/ParserBeforePreprocessHook.php index da21fb10748e..3780d2e8a4d8 100644 --- a/includes/parser/Hook/ParserBeforePreprocessHook.php +++ b/includes/parser/Hook/ParserBeforePreprocessHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Hook; -use Parser; +use MediaWiki\Parser\Parser; use StripState; /** diff --git a/includes/parser/Hook/ParserClearStateHook.php b/includes/parser/Hook/ParserClearStateHook.php index 37789168a9ac..fe6be98b9429 100644 --- a/includes/parser/Hook/ParserClearStateHook.php +++ b/includes/parser/Hook/ParserClearStateHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Hook; -use Parser; +use MediaWiki\Parser\Parser; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/parser/Hook/ParserClonedHook.php b/includes/parser/Hook/ParserClonedHook.php index 6adc151dc343..2bb2c2d72ac6 100644 --- a/includes/parser/Hook/ParserClonedHook.php +++ b/includes/parser/Hook/ParserClonedHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Hook; -use Parser; +use MediaWiki\Parser\Parser; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/parser/Hook/ParserFirstCallInitHook.php b/includes/parser/Hook/ParserFirstCallInitHook.php index 10b8414b4c1d..af2aafe22b4c 100644 --- a/includes/parser/Hook/ParserFirstCallInitHook.php +++ b/includes/parser/Hook/ParserFirstCallInitHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Hook; -use Parser; +use MediaWiki\Parser\Parser; /** * 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 2cd6fe55fe91..550b3c34ad20 100644 --- a/includes/parser/Hook/ParserGetVariableValueSwitchHook.php +++ b/includes/parser/Hook/ParserGetVariableValueSwitchHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Hook; -use Parser; +use MediaWiki\Parser\Parser; use PPFrame; /** diff --git a/includes/parser/Hook/ParserGetVariableValueTsHook.php b/includes/parser/Hook/ParserGetVariableValueTsHook.php index 6b769d31ff91..9ca44e3ca466 100644 --- a/includes/parser/Hook/ParserGetVariableValueTsHook.php +++ b/includes/parser/Hook/ParserGetVariableValueTsHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Hook; -use Parser; +use MediaWiki\Parser\Parser; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/parser/Hook/ParserLimitReportPrepareHook.php b/includes/parser/Hook/ParserLimitReportPrepareHook.php index 54c017aec5b7..0f2f65576910 100644 --- a/includes/parser/Hook/ParserLimitReportPrepareHook.php +++ b/includes/parser/Hook/ParserLimitReportPrepareHook.php @@ -2,8 +2,8 @@ namespace MediaWiki\Hook; +use MediaWiki\Parser\Parser; use MediaWiki\Parser\ParserOutput; -use Parser; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/parser/Hook/ParserMakeImageParamsHook.php b/includes/parser/Hook/ParserMakeImageParamsHook.php index 3840775f249d..3d91ba87306a 100644 --- a/includes/parser/Hook/ParserMakeImageParamsHook.php +++ b/includes/parser/Hook/ParserMakeImageParamsHook.php @@ -3,8 +3,8 @@ namespace MediaWiki\Hook; use File; +use MediaWiki\Parser\Parser; use MediaWiki\Title\Title; -use Parser; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/parser/Hook/ParserModifyImageHTMLHook.php b/includes/parser/Hook/ParserModifyImageHTMLHook.php index 5530df231dbb..27b2a619460b 100644 --- a/includes/parser/Hook/ParserModifyImageHTMLHook.php +++ b/includes/parser/Hook/ParserModifyImageHTMLHook.php @@ -3,7 +3,7 @@ namespace MediaWiki\Hook; use File; -use Parser; +use MediaWiki\Parser\Parser; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/parser/Hook/ParserPreSaveTransformCompleteHook.php b/includes/parser/Hook/ParserPreSaveTransformCompleteHook.php index 09630a52e17a..a5401a53fd42 100644 --- a/includes/parser/Hook/ParserPreSaveTransformCompleteHook.php +++ b/includes/parser/Hook/ParserPreSaveTransformCompleteHook.php @@ -2,7 +2,7 @@ namespace MediaWiki\Hook; -use Parser; +use MediaWiki\Parser\Parser; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/parser/LinkHolderArray.php b/includes/parser/LinkHolderArray.php index 8f757901677e..f3904e41a253 100644 --- a/includes/parser/LinkHolderArray.php +++ b/includes/parser/LinkHolderArray.php @@ -26,6 +26,7 @@ use MediaWiki\HookContainer\HookRunner; use MediaWiki\Linker\Linker; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Parser\Parser; use MediaWiki\Title\Title; /** diff --git a/includes/parser/PPFrame_Hash.php b/includes/parser/PPFrame_Hash.php index ebc23d7099fa..155ba7bee3ee 100644 --- a/includes/parser/PPFrame_Hash.php +++ b/includes/parser/PPFrame_Hash.php @@ -19,6 +19,7 @@ * @ingroup Parser */ +use MediaWiki\Parser\Parser; use MediaWiki\Title\Title; /** diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index 8356dcb1656a..2132f51e4054 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -21,6 +21,26 @@ * @ingroup Parser */ +namespace MediaWiki\Parser; + +use BadMethodCallException; +use BlockLevelPass; +use CoreMagicVariables; +use CoreParserFunctions; +use CoreTagHooks; +use Exception; +use File; +use HtmlArmor; +use ILanguageConverter; +use ImageGalleryBase; +use ImageGalleryClassNotFoundException; +use InvalidArgumentException; +use Language; +use LanguageCode; +use LinkHolderArray; +use LogicException; +use MapCacheLRU; +use MediaHandler; use MediaWiki\Cache\CacheKeyHelper; use MediaWiki\Category\TrackingCategories; use MediaWiki\Config\ServiceOptions; @@ -41,11 +61,6 @@ use MediaWiki\Output\OutputPage; use MediaWiki\Page\File\BadFileLookup; use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageReference; -use MediaWiki\Parser\MagicWordArray; -use MediaWiki\Parser\MagicWordFactory; -use MediaWiki\Parser\ParserOutput; -use MediaWiki\Parser\ParserOutputFlags; -use MediaWiki\Parser\Sanitizer; use MediaWiki\Preferences\SignatureValidatorFactory; use MediaWiki\Request\FauxRequest; use MediaWiki\Revision\RevisionAccessException; @@ -66,7 +81,22 @@ use MediaWiki\User\UserIdentity; use MediaWiki\User\UserNameUtils; use MediaWiki\Utils\MWTimestamp; use MediaWiki\Utils\UrlUtils; +use Message; +use ParserFactory; +use ParserOptions; +use ParserOutput; +use PPFrame; +use PPNode; +use Preprocessor; +use Preprocessor_Hash; use Psr\Log\LoggerInterface; +use RuntimeException; +use SectionProfiler; +use StringUtils; +use StripState; +use TextContent; +use UnexpectedValueException; +use WANObjectCache; use Wikimedia\Bcp47Code\Bcp47CodeValue; use Wikimedia\IPUtils; use Wikimedia\Parsoid\Core\SectionMetadata; @@ -75,6 +105,7 @@ use Wikimedia\Parsoid\DOM\DocumentFragment; use Wikimedia\Parsoid\Utils\DOMCompat; use Wikimedia\Parsoid\Utils\DOMUtils; use Wikimedia\ScopedCallback; +use Xml; /** * @defgroup Parser Parser @@ -116,7 +147,7 @@ use Wikimedia\ScopedCallback; * * @ingroup Parser */ -#[AllowDynamicProperties] +#[\AllowDynamicProperties] class Parser { # Flags for Parser::setFunctionHook @@ -6437,3 +6468,9 @@ class Parser { $this->logger->debug( __METHOD__ . ": set $flag flag on '$name'; $reason" ); } } + +/** + * Retain the old class name for backwards compatibility. + * @deprecated since 1.41 + */ +class_alias( Parser::class, 'Parser' ); diff --git a/includes/parser/ParserFactory.php b/includes/parser/ParserFactory.php index 51ff0030ba03..57b78c36d330 100644 --- a/includes/parser/ParserFactory.php +++ b/includes/parser/ParserFactory.php @@ -27,6 +27,7 @@ use MediaWiki\Languages\LanguageConverterFactory; 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; diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php index 61a704c9cdf0..1e9ce5f8fb1e 100644 --- a/includes/parser/ParserOptions.php +++ b/includes/parser/ParserOptions.php @@ -25,6 +25,7 @@ use MediaWiki\Context\IContextSource; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Parser\Parser; use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\SlotRecord; use MediaWiki\StubObject\StubObject; diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php index 3495363fc1cd..35a38696c58a 100644 --- a/includes/parser/ParserOutput.php +++ b/includes/parser/ParserOutput.php @@ -33,7 +33,6 @@ use MediaWiki\Output\OutputPage; use MediaWiki\Parser\Parsoid\PageBundleParserOutputConverter; use MediaWiki\Title\Title; use MediaWiki\Title\TitleValue; -use Parser; use ParserOptions; use UnexpectedValueException; use Wikimedia\Bcp47Code\Bcp47Code; diff --git a/includes/parser/Parsoid/Config/DataAccess.php b/includes/parser/Parsoid/Config/DataAccess.php index 07bba1f2fdbf..38b3dd0dffaa 100644 --- a/includes/parser/Parsoid/Config/DataAccess.php +++ b/includes/parser/Parsoid/Config/DataAccess.php @@ -31,8 +31,8 @@ use MediaWiki\HookContainer\HookRunner; use MediaWiki\Linker\Linker; use MediaWiki\MainConfigNames; use MediaWiki\Page\File\BadFileLookup; +use MediaWiki\Parser\Parser; use MediaWiki\Title\Title; -use Parser; use ParserFactory; use PPFrame; use RepoGroup; diff --git a/includes/parser/Preprocessor.php b/includes/parser/Preprocessor.php index b87ce52d13b9..18492ea646f2 100644 --- a/includes/parser/Preprocessor.php +++ b/includes/parser/Preprocessor.php @@ -21,6 +21,8 @@ * @ingroup Parser */ +use MediaWiki\Parser\Parser; + /** * @ingroup Parser */ diff --git a/includes/parser/Preprocessor_Hash.php b/includes/parser/Preprocessor_Hash.php index d09f6bd55189..5c35cb964c75 100644 --- a/includes/parser/Preprocessor_Hash.php +++ b/includes/parser/Preprocessor_Hash.php @@ -21,6 +21,8 @@ * @ingroup Parser */ +use MediaWiki\Parser\Parser; + /** * Differences from DOM schema: * * attribute nodes are children diff --git a/includes/parser/StripState.php b/includes/parser/StripState.php index 841758c47f55..ac6cc81cd6f7 100644 --- a/includes/parser/StripState.php +++ b/includes/parser/StripState.php @@ -21,6 +21,8 @@ * @ingroup Parser */ +use MediaWiki\Parser\Parser; + /** * @todo document, briefly. * @newable |