X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/mediawiki.git/blobdiff_plain/19e297c21b10b1b8a3acad5e73fc71dcb35db44a..6932310fd58ebef145fa01eb76edf7150284d8ea:/includes/parser/Parser.php diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index eddfd43c..e901f6f3 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -1,47 +1,69 @@ - * There are five main entry points into the Parser class: - * parse() + * There are seven main entry points into the Parser class: + * + * - Parser::parse() * produces HTML output - * preSaveTransform(). - * produces altered wiki markup. - * preprocess() + * - Parser::preSaveTransform() + * produces altered wiki markup + * - Parser::preprocess() * removes HTML comments and expands templates - * cleanSig() / cleanSigInSig() - * Cleans a signature before saving it to preferences - * extractSections() - * Extracts sections from an article for section editing - * getPreloadText() - * Removes sections, and tags. + * - Parser::cleanSig() and Parser::cleanSigInSig() + * cleans a signature before saving it to preferences + * - Parser::getSection() + * return the content of a section from an article for section editing + * - Parser::replaceSection() + * replaces a section by number inside an article + * - Parser::getPreloadText() + * removes sections and tags * * Globals used: - * objects: $wgLang, $wgContLang + * object: $wgContLang * - * NOT $wgArticle, $wgUser or $wgTitle. Keep them away! + * @warning $wgUser or $wgTitle or $wgRequest or $wgLang. Keep them away! * - * settings: - * $wgUseTex*, $wgUseDynamicDates*, $wgInterwikiMagic*, - * $wgNamespacesWithSubpages, $wgAllowExternalImages*, - * $wgLocaltimezone, $wgAllowSpecialInclusion*, - * $wgMaxArticleSize* + * @par Settings: + * $wgNamespacesWithSubpages * - * * only within ParserOptions - * + * @par Settings only within ParserOptions: + * $wgAllowExternalImages + * $wgAllowSpecialInclusion + * $wgInterwikiMagic + * $wgMaxArticleSize * * @ingroup Parser */ @@ -53,26 +75,34 @@ class Parser { */ const VERSION = '1.6.4'; + /** + * Update this version number when the output of serialiseHalfParsedText() + * changes in an incompatible way + */ + const HALF_PARSED_VERSION = 2; + # Flags for Parser::setFunctionHook - # Also available as global constants from Defines.php const SFH_NO_HASH = 1; const SFH_OBJECT_ARGS = 2; # Constants needed for external link processing # Everything except bracket, space, or control characters - const EXT_LINK_URL_CLASS = '[^][<>"\\x00-\\x20\\x7F]'; - const EXT_IMAGE_REGEX = '/^(http:\/\/|https:\/\/)([^][<>"\\x00-\\x20\\x7F]+) - \\/([A-Za-z0-9_.,~%\\-+&;#*?!=()@\\x80-\\xFF]+)\\.((?i)gif|png|jpg|jpeg)$/Sx'; - - # State constants for the definition list colon extraction - const COLON_STATE_TEXT = 0; - const COLON_STATE_TAG = 1; - const COLON_STATE_TAGSTART = 2; - const COLON_STATE_CLOSETAG = 3; - const COLON_STATE_TAGSLASH = 4; - const COLON_STATE_COMMENT = 5; - const COLON_STATE_COMMENTDASH = 6; - const COLON_STATE_COMMENTDASHDASH = 7; + # \p{Zs} is unicode 'separator, space' category. It covers the space 0x20 + # as well as U+3000 is IDEOGRAPHIC SPACE for T21052 + # \x{FFFD} is the Unicode replacement character, which Preprocessor_DOM + # uses to replace invalid HTML characters. + const EXT_LINK_URL_CLASS = '[^][<>"\\x00-\\x20\\x7F\p{Zs}\x{FFFD}]'; + # Simplified expression to match an IPv4 or IPv6 address, or + # at least one character of a host name (embeds EXT_LINK_URL_CLASS) + const EXT_LINK_ADDR = '(?:[0-9.]+|\\[(?i:[0-9a-f:.]+)\\]|[^][<>"\\x00-\\x20\\x7F\p{Zs}\x{FFFD}])'; + # RegExp to make image URLs (embeds IPv6 part of EXT_LINK_ADDR) + // @codingStandardsIgnoreStart Generic.Files.LineLength + const EXT_IMAGE_REGEX = '/^(http:\/\/|https:\/\/)((?:\\[(?i:[0-9a-f:.]+)\\])?[^][<>"\\x00-\\x20\\x7F\p{Zs}\x{FFFD}]+) + \\/([A-Za-z0-9_.,~%\\-+&;#*?!=()@\\x80-\\xFF]+)\\.((?i)gif|png|jpg|jpeg)$/Sxu'; + // @codingStandardsIgnoreEnd + + # Regular expression for a non-newline space + const SPACE_NOT_NL = '(?:\t| |&\#0*160;|&\#[Xx]0*[Aa]0;|\p{Zs})'; # Flags for preprocessToDom const PTD_FOR_INCLUSION = 1; @@ -85,56 +115,165 @@ class Parser { const OT_MSG = 3; const OT_PLAIN = 4; # like extractSections() - portions of the original are returned unchanged. - # Marker Suffix needs to be accessible staticly. - const MARKER_SUFFIX = "-QINU\x7f"; + /** + * @var string Prefix and suffix for temporary replacement strings + * for the multipass parser. + * + * \x7f should never appear in input as it's disallowed in XML. + * Using it at the front also gives us a little extra robustness + * since it shouldn't match when butted up against identifier-like + * string constructs. + * + * Must not consist of all title characters, or else it will change + * the behavior of in a link. + * + * Must have a character that needs escaping in attributes, otherwise + * someone could put a strip marker in an attribute, to get around + * escaping quote marks, and break out of the attribute. Thus we add + * `'". + */ + const MARKER_SUFFIX = "-QINU`\"'\x7f"; + const MARKER_PREFIX = "\x7f'\"`UNIQ-"; + + # Markers used for wrapping the table of contents + const TOC_START = ''; + const TOC_END = ''; # Persistent: - var $mTagHooks, $mTransparentTagHooks, $mFunctionHooks, $mFunctionSynonyms, $mVariables; - var $mSubstWords, $mImageParams, $mImageParamsMagicArray, $mStripList, $mMarkerIndex; - var $mPreprocessor, $mExtLinkBracketedRegex, $mUrlProtocols, $mDefaultStripList; - var $mVarCache, $mConf, $mFunctionTagHooks; + public $mTagHooks = []; + public $mTransparentTagHooks = []; + public $mFunctionHooks = []; + public $mFunctionSynonyms = [ 0 => [], 1 => [] ]; + public $mFunctionTagHooks = []; + public $mStripList = []; + public $mDefaultStripList = []; + public $mVarCache = []; + public $mImageParams = []; + public $mImageParamsMagicArray = []; + public $mMarkerIndex = 0; + public $mFirstCall = true; + + # Initialised by initialiseVariables() + + /** + * @var MagicWordArray + */ + public $mVariables; + /** + * @var MagicWordArray + */ + public $mSubstWords; + # Initialised in constructor + public $mConf, $mExtLinkBracketedRegex, $mUrlProtocols; + + # Initialized in getPreprocessor() + /** @var Preprocessor */ + public $mPreprocessor; # Cleared with clearState(): - var $mOutput, $mAutonumber, $mDTopen, $mStripState; - var $mIncludeCount, $mArgStack, $mLastSection, $mInPre; - var $mLinkHolders, $mLinkID; - var $mIncludeSizes, $mPPNodeCount, $mDefaultSort; - var $mTplExpandCache; # empty-frame expansion cache - var $mTplRedirCache, $mTplDomCache, $mHeadings, $mDoubleUnderscores; - var $mExpensiveFunctionCount; # number of expensive parser function calls + /** + * @var ParserOutput + */ + public $mOutput; + public $mAutonumber; + + /** + * @var StripState + */ + public $mStripState; + + public $mIncludeCount; + /** + * @var LinkHolderArray + */ + public $mLinkHolders; + + public $mLinkID; + public $mIncludeSizes, $mPPNodeCount, $mGeneratedPPNodeCount, $mHighestExpansionDepth; + public $mDefaultSort; + public $mTplRedirCache, $mTplDomCache, $mHeadings, $mDoubleUnderscores; + public $mExpensiveFunctionCount; # number of expensive parser function calls + public $mShowToc, $mForceTocPosition; + + /** + * @var User + */ + public $mUser; # User object; only used when doing pre-save transform # Temporary # These are variables reset at least once per parse regardless of $clearState - var $mOptions; # ParserOptions object - var $mTitle; # Title context, used for self-link rendering and similar things - var $mOutputType; # Output type, one of the OT_xxx constants - var $ot; # Shortcut alias, see setOutputType() - var $mRevisionId; # ID to display in {{REVISIONID}} tags - var $mRevisionTimestamp; # The timestamp of the specified revision ID - var $mRevIdForTs; # The revision ID which was used to fetch the timestamp /** - * Constructor + * @var ParserOptions + */ + public $mOptions; + + /** + * @var Title + */ + public $mTitle; # Title context, used for self-link rendering and similar things + public $mOutputType; # Output type, one of the OT_xxx constants + public $ot; # Shortcut alias, see setOutputType() + public $mRevisionObject; # The revision object of the specified revision ID + public $mRevisionId; # ID to display in {{REVISIONID}} tags + public $mRevisionTimestamp; # The timestamp of the specified revision ID + public $mRevisionUser; # User to display in {{REVISIONUSER}} tag + public $mRevisionSize; # Size to display in {{REVISIONSIZE}} variable + public $mRevIdForTs; # The revision ID which was used to fetch the timestamp + public $mInputSize = false; # For {{PAGESIZE}} on current page. + + /** + * @var string Deprecated accessor for the strip marker prefix. + * @deprecated since 1.26; use Parser::MARKER_PREFIX instead. + */ + public $mUniqPrefix = self::MARKER_PREFIX; + + /** + * @var array Array with the language name of each language link (i.e. the + * interwiki prefix) in the key, value arbitrary. Used to avoid sending + * duplicate language links to the ParserOutput. + */ + public $mLangLinkLanguages; + + /** + * @var MapCacheLRU|null + * @since 1.24 * - * @public + * A cache of the current revisions of titles. Keys are $title->getPrefixedDbKey() + */ + public $currentRevisionCache; + + /** + * @var bool|string Recursive call protection. + * This variable should be treated as if it were private. + */ + public $mInParse = false; + + /** @var SectionProfiler */ + protected $mProfiler; + + /** + * @var LinkRenderer + */ + protected $mLinkRenderer; + + /** + * @param array $conf */ - function __construct( $conf = array() ) { + public function __construct( $conf = [] ) { $this->mConf = $conf; - $this->mTagHooks = array(); - $this->mTransparentTagHooks = array(); - $this->mFunctionHooks = array(); - $this->mFunctionTagHooks = array(); - $this->mFunctionSynonyms = array( 0 => array(), 1 => array() ); - $this->mDefaultStripList = $this->mStripList = array(); $this->mUrlProtocols = wfUrlProtocols(); - $this->mExtLinkBracketedRegex = '/\[(\b(' . wfUrlProtocols() . ')'. - '[^][<>"\\x00-\\x20\\x7F]+) *([^\]\\x00-\\x08\\x0a-\\x1F]*?)\]/S'; - $this->mVarCache = array(); + $this->mExtLinkBracketedRegex = '/\[(((?i)' . $this->mUrlProtocols . ')' . + self::EXT_LINK_ADDR . + self::EXT_LINK_URL_CLASS . '*)\p{Zs}*([^\]\\x00-\\x08\\x0a-\\x1F\\x{FFFD}]*?)\]/Su'; if ( isset( $conf['preprocessorClass'] ) ) { $this->mPreprocessorClass = $conf['preprocessorClass']; + } elseif ( defined( 'HPHP_VERSION' ) ) { + # Preprocessor_Hash is much faster than Preprocessor_DOM under HipHop + $this->mPreprocessorClass = 'Preprocessor_Hash'; } elseif ( extension_loaded( 'domxml' ) ) { - # PECL extension that conflicts with the core DOM extension (bug 13770) + # PECL extension that conflicts with the core DOM extension (T15770) wfDebug( "Warning: you have the obsolete domxml extension for PHP. Please remove it!\n" ); $this->mPreprocessorClass = 'Preprocessor_Hash'; } elseif ( extension_loaded( 'dom' ) ) { @@ -142,39 +281,60 @@ class Parser { } else { $this->mPreprocessorClass = 'Preprocessor_Hash'; } - $this->mMarkerIndex = 0; - $this->mFirstCall = true; + wfDebug( __CLASS__ . ": using preprocessor: {$this->mPreprocessorClass}\n" ); } /** * Reduce memory usage to reduce the impact of circular references */ - function __destruct() { + public function __destruct() { if ( isset( $this->mLinkHolders ) ) { - $this->mLinkHolders->__destruct(); + unset( $this->mLinkHolders ); } foreach ( $this as $name => $value ) { unset( $this->$name ); } } + /** + * Allow extensions to clean up when the parser is cloned + */ + public function __clone() { + $this->mInParse = false; + + // T58226: When you create a reference "to" an object field, that + // makes the object field itself be a reference too (until the other + // reference goes out of scope). When cloning, any field that's a + // reference is copied as a reference in the new object. Both of these + // are defined PHP5 behaviors, as inconvenient as it is for us when old + // hooks from PHP4 days are passing fields by reference. + foreach ( [ 'mStripState', 'mVarCache' ] as $k ) { + // Make a non-reference copy of the field, then rebind the field to + // reference the new copy. + $tmp = $this->$k; + $this->$k =& $tmp; + unset( $tmp ); + } + + Hooks::run( 'ParserCloned', [ $this ] ); + } + /** * Do various kinds of initialisation on the first call of the parser */ - function firstCallInit() { + public function firstCallInit() { if ( !$this->mFirstCall ) { return; } $this->mFirstCall = false; - wfProfileIn( __METHOD__ ); - CoreParserFunctions::register( $this ); CoreTagHooks::register( $this ); $this->initialiseVariables(); - wfRunHooks( 'ParserFirstCallInit', array( &$this ) ); - wfProfileOut( __METHOD__ ); + // Avoid PHP 7.1 warning from passing $this by reference + $parser = $this; + Hooks::run( 'ParserFirstCallInit', [ &$parser ] ); } /** @@ -182,53 +342,40 @@ class Parser { * * @private */ - function clearState() { - wfProfileIn( __METHOD__ ); + public function clearState() { if ( $this->mFirstCall ) { $this->firstCallInit(); } $this->mOutput = new ParserOutput; - $this->mOptions->registerWatcher( array( $this->mOutput, 'recordOption' ) ); + $this->mOptions->registerWatcher( [ $this->mOutput, 'recordOption' ] ); $this->mAutonumber = 0; - $this->mLastSection = ''; - $this->mDTopen = false; - $this->mIncludeCount = array(); - $this->mStripState = new StripState; - $this->mArgStack = false; - $this->mInPre = false; + $this->mIncludeCount = []; $this->mLinkHolders = new LinkHolderArray( $this ); $this->mLinkID = 0; - $this->mRevisionTimestamp = $this->mRevisionId = null; - $this->mVarCache = array(); - - /** - * Prefix for temporary replacement strings for the multipass parser. - * \x07 should never appear in input as it's disallowed in XML. - * Using it at the front also gives us a little extra robustness - * since it shouldn't match when butted up against identifier-like - * string constructs. - * - * Must not consist of all title characters, or else it will change - * the behaviour of in a link. - */ - # $this->mUniqPrefix = "\x07UNIQ" . Parser::getRandomString(); - # Changed to \x7f to allow XML double-parsing -- TS - $this->mUniqPrefix = "\x7fUNIQ" . self::getRandomString(); + $this->mRevisionObject = $this->mRevisionTimestamp = + $this->mRevisionId = $this->mRevisionUser = $this->mRevisionSize = null; + $this->mVarCache = []; + $this->mUser = null; + $this->mLangLinkLanguages = []; + $this->currentRevisionCache = null; + $this->mStripState = new StripState; - # Clear these on every parse, bug 4549 - $this->mTplExpandCache = $this->mTplRedirCache = $this->mTplDomCache = array(); + # Clear these on every parse, T6549 + $this->mTplRedirCache = $this->mTplDomCache = []; $this->mShowToc = true; $this->mForceTocPosition = false; - $this->mIncludeSizes = array( + $this->mIncludeSizes = [ 'post-expand' => 0, 'arg' => 0, - ); + ]; $this->mPPNodeCount = 0; + $this->mGeneratedPPNodeCount = 0; + $this->mHighestExpansionDepth = 0; $this->mDefaultSort = false; - $this->mHeadings = array(); - $this->mDoubleUnderscores = array(); + $this->mHeadings = []; + $this->mDoubleUnderscores = []; $this->mExpensiveFunctionCount = 0; # Fix cloning @@ -236,85 +383,75 @@ class Parser { $this->mPreprocessor = null; } - wfRunHooks( 'ParserClearState', array( &$this ) ); - wfProfileOut( __METHOD__ ); + $this->mProfiler = new SectionProfiler(); + + // Avoid PHP 7.1 warning from passing $this by reference + $parser = $this; + Hooks::run( 'ParserClearState', [ &$parser ] ); } /** * Convert wikitext to HTML * Do not call this function recursively. * - * @param $text String: text we want to parse - * @param $title A title object - * @param $options ParserOptions - * @param $linestart boolean - * @param $clearState boolean - * @param $revid Int: number to pass in {{REVISIONID}} - * @return ParserOutput a ParserOutput + * @param string $text Text we want to parse + * @param Title $title + * @param ParserOptions $options + * @param bool $linestart + * @param bool $clearState + * @param int $revid Number to pass in {{REVISIONID}} + * @return ParserOutput A ParserOutput */ - public function parse( $text, Title $title, ParserOptions $options, $linestart = true, $clearState = true, $revid = null ) { + public function parse( + $text, Title $title, ParserOptions $options, + $linestart = true, $clearState = true, $revid = null + ) { /** * First pass--just handle sections, pass the rest off * to internalParse() which does all the real work. */ - global $wgUseTidy, $wgAlwaysUseTidy, $wgContLang, $wgDisableLangConversion, $wgDisableTitleConversion; - $fname = __METHOD__.'-' . wfGetCaller(); - wfProfileIn( __METHOD__ ); - wfProfileIn( $fname ); + global $wgShowHostnames; - $this->mOptions = $options; if ( $clearState ) { - $this->clearState(); + // We use U+007F DELETE to construct strip markers, so we have to make + // sure that this character does not occur in the input text. + $text = strtr( $text, "\x7f", "?" ); + $magicScopeVariable = $this->lock(); } + // Strip U+0000 NULL (T159174) + $text = str_replace( "\000", '', $text ); - $this->setTitle( $title ); # Page title has to be set for the pre-processor + $this->startParse( $title, $options, self::OT_HTML, $clearState ); + + $this->currentRevisionCache = null; + $this->mInputSize = strlen( $text ); + if ( $this->mOptions->getEnableLimitReport() ) { + $this->mOutput->resetParseStartTime(); + } $oldRevisionId = $this->mRevisionId; + $oldRevisionObject = $this->mRevisionObject; $oldRevisionTimestamp = $this->mRevisionTimestamp; + $oldRevisionUser = $this->mRevisionUser; + $oldRevisionSize = $this->mRevisionSize; if ( $revid !== null ) { $this->mRevisionId = $revid; + $this->mRevisionObject = null; $this->mRevisionTimestamp = null; + $this->mRevisionUser = null; + $this->mRevisionSize = null; } - $this->setOutputType( self::OT_HTML ); - wfRunHooks( 'ParserBeforeStrip', array( &$this, &$text, &$this->mStripState ) ); + + // Avoid PHP 7.1 warning from passing $this by reference + $parser = $this; + Hooks::run( 'ParserBeforeStrip', [ &$parser, &$text, &$this->mStripState ] ); # No more strip! - wfRunHooks( 'ParserAfterStrip', array( &$this, &$text, &$this->mStripState ) ); + Hooks::run( 'ParserAfterStrip', [ &$parser, &$text, &$this->mStripState ] ); $text = $this->internalParse( $text ); + Hooks::run( 'ParserAfterParse', [ &$parser, &$text, &$this->mStripState ] ); - $text = $this->mStripState->unstripGeneral( $text ); - - # Clean up special characters, only run once, next-to-last before doBlockLevels - $fixtags = array( - # french spaces, last one Guillemet-left - # only if there is something before the space - '/(.) (?=\\?|:|;|!|%|\\302\\273)/' => '\\1 \\2', - # french spaces, Guillemet-right - '/(\\302\\253) /' => '\\1 ', - '/ (!\s*important)/' => ' \\1', # Beware of CSS magic word !important, bug #11874. - ); - $text = preg_replace( array_keys( $fixtags ), array_values( $fixtags ), $text ); - - $text = $this->doBlockLevels( $text, $linestart ); - - $this->replaceLinkHolders( $text ); - - /** - * The page doesn't get language converted if - * a) It's disabled - * b) Content isn't converted - * c) It's a conversion table - */ - if ( !( $wgDisableLangConversion - || isset( $this->mDoubleUnderscores['nocontentconvert'] ) - || $this->mTitle->isConversionTable() ) ) { - - # The position of the convert() call should not be changed. it - # assumes that the links are all replaced and the only thing left - # is the mark. - - $text = $wgContLang->convert( $text ); - } + $text = $this->internalParseHalfParsed( $text, true, $linestart ); /** * A converted title will be provided in the output object if title and @@ -323,156 +460,274 @@ class Parser { * {{DISPLAYTITLE:...}} is present. DISPLAYTITLE takes precedence over * automatic link conversion. */ - if ( !( $wgDisableLangConversion - || $wgDisableTitleConversion - || isset( $this->mDoubleUnderscores['nocontentconvert'] ) - || isset( $this->mDoubleUnderscores['notitleconvert'] ) - || $this->mOutput->getDisplayTitle() !== false ) ) - { - $convruletitle = $wgContLang->getConvRuleTitle(); + if ( !( $options->getDisableTitleConversion() + || isset( $this->mDoubleUnderscores['nocontentconvert'] ) + || isset( $this->mDoubleUnderscores['notitleconvert'] ) + || $this->mOutput->getDisplayTitle() !== false ) + ) { + $convruletitle = $this->getConverterLanguage()->getConvRuleTitle(); if ( $convruletitle ) { $this->mOutput->setTitleText( $convruletitle ); } else { - $titleText = $wgContLang->convertTitle( $title ); + $titleText = $this->getConverterLanguage()->convertTitle( $title ); $this->mOutput->setTitleText( $titleText ); } } - $text = $this->mStripState->unstripNoWiki( $text ); - - wfRunHooks( 'ParserBeforeTidy', array( &$this, &$text ) ); + # Done parsing! Compute runtime adaptive expiry if set + $this->mOutput->finalizeAdaptiveCacheExpiry(); -//!JF Move to its own function + # Warn if too many heavyweight parser functions were used + if ( $this->mExpensiveFunctionCount > $this->mOptions->getExpensiveParserFunctionLimit() ) { + $this->limitationWarn( 'expensive-parserfunction', + $this->mExpensiveFunctionCount, + $this->mOptions->getExpensiveParserFunctionLimit() + ); + } - $uniq_prefix = $this->mUniqPrefix; - $matches = array(); - $elements = array_keys( $this->mTransparentTagHooks ); - $text = $this->extractTagsAndParams( $elements, $text, $matches, $uniq_prefix ); + # Information on include size limits, for the benefit of users who try to skirt them + if ( $this->mOptions->getEnableLimitReport() ) { + $max = $this->mOptions->getMaxIncludeSize(); - foreach ( $matches as $marker => $data ) { - list( $element, $content, $params, $tag ) = $data; - $tagName = strtolower( $element ); - if ( isset( $this->mTransparentTagHooks[$tagName] ) ) { - $output = call_user_func_array( $this->mTransparentTagHooks[$tagName], array( $content, $params, $this ) ); - } else { - $output = $tag; + $cpuTime = $this->mOutput->getTimeSinceStart( 'cpu' ); + if ( $cpuTime !== null ) { + $this->mOutput->setLimitReportData( 'limitreport-cputime', + sprintf( "%.3f", $cpuTime ) + ); } - $this->mStripState->general->setPair( $marker, $output ); - } - $text = $this->mStripState->unstripGeneral( $text ); - $text = Sanitizer::normalizeCharReferences( $text ); + $wallTime = $this->mOutput->getTimeSinceStart( 'wall' ); + $this->mOutput->setLimitReportData( 'limitreport-walltime', + sprintf( "%.3f", $wallTime ) + ); - if ( ( $wgUseTidy && $this->mOptions->getTidy() ) || $wgAlwaysUseTidy ) { - $text = MWTidy::tidy( $text ); - } else { - # attempt to sanitize at least some nesting problems - # (bug #2702 and quite a few others) - $tidyregs = array( - # ''Something [http://www.cool.com cool''] --> - # Somethingcool> - '/(<([bi])>)(<([bi])>)?([^<]*)(<\/?a[^<]*>)([^<]*)(<\/\\4>)?(<\/\\2>)/' => - '\\1\\3\\5\\8\\9\\6\\1\\3\\7\\8\\9', - # fix up an anchor inside another anchor, only - # at least for a single single nested link (bug 3695) - '/(]+>)([^<]*)(]+>[^<]*)<\/a>(.*)<\/a>/' => - '\\1\\2\\3\\1\\4', - # fix div inside inline elements- doBlockLevels won't wrap a line which - # contains a div, so fix it up here; replace - # div with escaped text - '/(<([aib]) [^>]+>)([^<]*)(]*)>)(.*)(<\/div>)([^<]*)(<\/\\2>)/' => - '\\1\\3<div\\5>\\6</div>\\8\\9', - # remove empty italic or bold tag pairs, some - # introduced by rules above - '/<([bi])><\/\\1>/' => '', + $this->mOutput->setLimitReportData( 'limitreport-ppvisitednodes', + [ $this->mPPNodeCount, $this->mOptions->getMaxPPNodeCount() ] + ); + $this->mOutput->setLimitReportData( 'limitreport-ppgeneratednodes', + [ $this->mGeneratedPPNodeCount, $this->mOptions->getMaxGeneratedPPNodeCount() ] + ); + $this->mOutput->setLimitReportData( 'limitreport-postexpandincludesize', + [ $this->mIncludeSizes['post-expand'], $max ] + ); + $this->mOutput->setLimitReportData( 'limitreport-templateargumentsize', + [ $this->mIncludeSizes['arg'], $max ] ); + $this->mOutput->setLimitReportData( 'limitreport-expansiondepth', + [ $this->mHighestExpansionDepth, $this->mOptions->getMaxPPExpandDepth() ] + ); + $this->mOutput->setLimitReportData( 'limitreport-expensivefunctioncount', + [ $this->mExpensiveFunctionCount, $this->mOptions->getExpensiveParserFunctionLimit() ] + ); + Hooks::run( 'ParserLimitReportPrepare', [ $this, $this->mOutput ] ); - $text = preg_replace( - array_keys( $tidyregs ), - array_values( $tidyregs ), - $text ); - } - global $wgExpensiveParserFunctionLimit; - if ( $this->mExpensiveFunctionCount > $wgExpensiveParserFunctionLimit ) { - $this->limitationWarn( 'expensive-parserfunction', $this->mExpensiveFunctionCount, $wgExpensiveParserFunctionLimit ); - } + $limitReport = "NewPP limit report\n"; + if ( $wgShowHostnames ) { + $limitReport .= 'Parsed by ' . wfHostname() . "\n"; + } + $limitReport .= 'Cached time: ' . $this->mOutput->getCacheTime() . "\n"; + $limitReport .= 'Cache expiry: ' . $this->mOutput->getCacheExpiry() . "\n"; + $limitReport .= 'Dynamic content: ' . + ( $this->mOutput->hasDynamicContent() ? 'true' : 'false' ) . + "\n"; + + foreach ( $this->mOutput->getLimitReportData() as $key => $value ) { + if ( Hooks::run( 'ParserLimitReportFormat', + [ $key, &$value, &$limitReport, false, false ] + ) ) { + $keyMsg = wfMessage( $key )->inLanguage( 'en' )->useDatabase( false ); + $valueMsg = wfMessage( [ "$key-value-text", "$key-value" ] ) + ->inLanguage( 'en' )->useDatabase( false ); + if ( !$valueMsg->exists() ) { + $valueMsg = new RawMessage( '$1' ); + } + if ( !$keyMsg->isDisabled() && !$valueMsg->isDisabled() ) { + $valueMsg->params( $value ); + $limitReport .= "{$keyMsg->text()}: {$valueMsg->text()}\n"; + } + } + } + // Since we're not really outputting HTML, decode the entities and + // then re-encode the things that need hiding inside HTML comments. + $limitReport = htmlspecialchars_decode( $limitReport ); + // Run deprecated hook + Hooks::run( 'ParserLimitReport', [ $this, &$limitReport ], '1.22' ); + + // Sanitize for comment. Note '‐' in the replacement is U+2010, + // which looks much like the problematic '-'. + $limitReport = str_replace( [ '-', '&' ], [ '‐', '&' ], $limitReport ); + $text .= "\n\n"; - wfRunHooks( 'ParserAfterTidy', array( &$this, &$text ) ); + // Add on template profiling data in human/machine readable way + $dataByFunc = $this->mProfiler->getFunctionStats(); + uasort( $dataByFunc, function ( $a, $b ) { + return $a['real'] < $b['real']; // descending order + } ); + $profileReport = []; + foreach ( array_slice( $dataByFunc, 0, 10 ) as $item ) { + $profileReport[] = sprintf( "%6.2f%% %8.3f %6d %s", + $item['%real'], $item['real'], $item['calls'], + htmlspecialchars( $item['name'] ) ); + } + $text .= "\n"; - # Information on include size limits, for the benefit of users who try to skirt them - if ( $this->mOptions->getEnableLimitReport() ) { - $max = $this->mOptions->getMaxIncludeSize(); - $PFreport = "Expensive parser function count: {$this->mExpensiveFunctionCount}/$wgExpensiveParserFunctionLimit\n"; - $limitReport = - "NewPP limit report\n" . - "Preprocessor node count: {$this->mPPNodeCount}/{$this->mOptions->getMaxPPNodeCount()}\n" . - "Post-expand include size: {$this->mIncludeSizes['post-expand']}/$max bytes\n" . - "Template argument size: {$this->mIncludeSizes['arg']}/$max bytes\n". - $PFreport; - wfRunHooks( 'ParserLimitReport', array( $this, &$limitReport ) ); - $text .= "\n\n"; + $this->mOutput->setLimitReportData( 'limitreport-timingprofile', $profileReport ); + + // Add other cache related metadata + if ( $wgShowHostnames ) { + $this->mOutput->setLimitReportData( 'cachereport-origin', wfHostname() ); + } + $this->mOutput->setLimitReportData( 'cachereport-timestamp', + $this->mOutput->getCacheTime() ); + $this->mOutput->setLimitReportData( 'cachereport-ttl', + $this->mOutput->getCacheExpiry() ); + $this->mOutput->setLimitReportData( 'cachereport-transientcontent', + $this->mOutput->hasDynamicContent() ); + + if ( $this->mGeneratedPPNodeCount > $this->mOptions->getMaxGeneratedPPNodeCount() / 10 ) { + wfDebugLog( 'generated-pp-node-count', $this->mGeneratedPPNodeCount . ' ' . + $this->mTitle->getPrefixedDBkey() ); + } + } + + # Wrap non-interface parser output in a
so it can be targeted + # with CSS (T37247) + $class = $this->mOptions->getWrapOutputClass(); + if ( $class !== false && !$this->mOptions->getInterfaceMessage() ) { + $text = Html::rawElement( 'div', [ 'class' => $class ], $text ); } + $this->mOutput->setText( $text ); $this->mRevisionId = $oldRevisionId; + $this->mRevisionObject = $oldRevisionObject; $this->mRevisionTimestamp = $oldRevisionTimestamp; - wfProfileOut( $fname ); - wfProfileOut( __METHOD__ ); + $this->mRevisionUser = $oldRevisionUser; + $this->mRevisionSize = $oldRevisionSize; + $this->mInputSize = false; + $this->currentRevisionCache = null; return $this->mOutput; } /** - * Recursive parser entry point that can be called from an extension tag - * hook. + * Half-parse wikitext to half-parsed HTML. This recursive parser entry point + * can be called from an extension tag hook. + * + * The output of this function IS NOT SAFE PARSED HTML; it is "half-parsed" + * instead, which means that lists and links have not been fully parsed yet, + * and strip markers are still present. * - * If $frame is not provided, then template variables (e.g., {{{1}}}) within $text are not expanded + * Use recursiveTagParseFully() to fully parse wikitext to output-safe HTML. * - * @param $text String: text extension wants to have parsed - * @param $frame PPFrame: The frame to use for expanding any template variables + * Use this function if you're a parser tag hook and you want to parse + * wikitext before or after applying additional transformations, and you + * intend to *return the result as hook output*, which will cause it to go + * through the rest of parsing process automatically. + * + * If $frame is not provided, then template variables (e.g., {{{1}}}) within + * $text are not expanded + * + * @param string $text Text extension wants to have parsed + * @param bool|PPFrame $frame The frame to use for expanding any template variables + * @return string UNSAFE half-parsed HTML */ - function recursiveTagParse( $text, $frame=false ) { - wfProfileIn( __METHOD__ ); - wfRunHooks( 'ParserBeforeStrip', array( &$this, &$text, &$this->mStripState ) ); - wfRunHooks( 'ParserAfterStrip', array( &$this, &$text, &$this->mStripState ) ); + public function recursiveTagParse( $text, $frame = false ) { + // Avoid PHP 7.1 warning from passing $this by reference + $parser = $this; + Hooks::run( 'ParserBeforeStrip', [ &$parser, &$text, &$this->mStripState ] ); + Hooks::run( 'ParserAfterStrip', [ &$parser, &$text, &$this->mStripState ] ); $text = $this->internalParse( $text, false, $frame ); - wfProfileOut( __METHOD__ ); + return $text; + } + + /** + * Fully parse wikitext to fully parsed HTML. This recursive parser entry + * point can be called from an extension tag hook. + * + * The output of this function is fully-parsed HTML that is safe for output. + * If you're a parser tag hook, you might want to use recursiveTagParse() + * instead. + * + * If $frame is not provided, then template variables (e.g., {{{1}}}) within + * $text are not expanded + * + * @since 1.25 + * + * @param string $text Text extension wants to have parsed + * @param bool|PPFrame $frame The frame to use for expanding any template variables + * @return string Fully parsed HTML + */ + public function recursiveTagParseFully( $text, $frame = false ) { + $text = $this->recursiveTagParse( $text, $frame ); + $text = $this->internalParseHalfParsed( $text, false ); return $text; } /** * Expand templates and variables in the text, producing valid, static wikitext. * Also removes comments. + * Do not call this function recursively. + * @param string $text + * @param Title $title + * @param ParserOptions $options + * @param int|null $revid + * @param bool|PPFrame $frame + * @return mixed|string */ - function preprocess( $text, Title $title, ParserOptions $options, $revid = null ) { - wfProfileIn( __METHOD__ ); - $this->mOptions = $options; - $this->clearState(); - $this->setOutputType( self::OT_PREPROCESS ); - $this->setTitle( $title ); + public function preprocess( $text, Title $title = null, + ParserOptions $options, $revid = null, $frame = false + ) { + $magicScopeVariable = $this->lock(); + $this->startParse( $title, $options, self::OT_PREPROCESS, true ); if ( $revid !== null ) { $this->mRevisionId = $revid; } - wfRunHooks( 'ParserBeforeStrip', array( &$this, &$text, &$this->mStripState ) ); - wfRunHooks( 'ParserAfterStrip', array( &$this, &$text, &$this->mStripState ) ); - $text = $this->replaceVariables( $text ); + // Avoid PHP 7.1 warning from passing $this by reference + $parser = $this; + Hooks::run( 'ParserBeforeStrip', [ &$parser, &$text, &$this->mStripState ] ); + Hooks::run( 'ParserAfterStrip', [ &$parser, &$text, &$this->mStripState ] ); + $text = $this->replaceVariables( $text, $frame ); + $text = $this->mStripState->unstripBoth( $text ); + return $text; + } + + /** + * Recursive parser entry point that can be called from an extension tag + * hook. + * + * @param string $text Text to be expanded + * @param bool|PPFrame $frame The frame to use for expanding any template variables + * @return string + * @since 1.19 + */ + public function recursivePreprocess( $text, $frame = false ) { + $text = $this->replaceVariables( $text, $frame ); $text = $this->mStripState->unstripBoth( $text ); - wfProfileOut( __METHOD__ ); return $text; } /** - * Process the wikitext for the ?preload= feature. (bug 5210) + * Process the wikitext for the "?preload=" feature. (T7210) + * + * "", "" etc. are parsed as for template + * transclusion, comments, templates, arguments, tags hooks and parser + * functions are untouched. * - * , etc. are parsed as for template transclusion, - * comments, templates, arguments, tags hooks and parser functions are untouched. + * @param string $text + * @param Title $title + * @param ParserOptions $options + * @param array $params + * @return string */ - public function getPreloadText( $text, Title $title, ParserOptions $options ) { + public function getPreloadText( $text, Title $title, ParserOptions $options, $params = [] ) { + $msg = new RawMessage( $text ); + $text = $msg->params( $params )->plain(); + # Parser (re)initialisation - $this->mOptions = $options; - $this->clearState(); - $this->setOutputType( self::OT_PLAIN ); - $this->setTitle( $title ); + $magicScopeVariable = $this->lock(); + $this->startParse( $title, $options, self::OT_PLAIN, true ); $flags = PPFrame::NO_ARGS | PPFrame::NO_TEMPLATES; $dom = $this->preprocessToDom( $text, self::PTD_FOR_INCLUSION ); @@ -482,45 +737,28 @@ class Parser { } /** - * Get a random string + * Set the current user. + * Should only be used when doing pre-save transform. * - * @private - * @static + * @param User|null $user User object or null (to reset) */ - static private function getRandomString() { - return dechex( mt_rand( 0, 0x7fffffff ) ) . dechex( mt_rand( 0, 0x7fffffff ) ); + public function setUser( $user ) { + $this->mUser = $user; } /** - * Accessor for mUniqPrefix. + * Set the context title * - * @return String + * @param Title $t */ - public function uniqPrefix() { - if ( !isset( $this->mUniqPrefix ) ) { - # @todo Fixme: this is probably *horribly wrong* - # LanguageConverter seems to want $wgParser's uniqPrefix, however - # if this is called for a parser cache hit, the parser may not - # have ever been initialized in the first place. - # Not really sure what the heck is supposed to be going on here. - return ''; - # throw new MWException( "Accessing uninitialized mUniqPrefix" ); + public function setTitle( $t ) { + if ( !$t ) { + $t = Title::newFromText( 'NO TITLE' ); } - return $this->mUniqPrefix; - } - /** - * Set the context title - */ - function setTitle( $t ) { - if ( !$t || $t instanceof FakeTitle ) { - $t = Title::newFromText( 'NO TITLE' ); - } - - if ( strval( $t->getFragment() ) !== '' ) { + if ( $t->hasFragment() ) { # Strip the fragment to avoid various odd effects - $this->mTitle = clone $t; - $this->mTitle->setFragment( '' ); + $this->mTitle = $t->createFragmentTarget( '' ); } else { $this->mTitle = $t; } @@ -529,97 +767,148 @@ class Parser { /** * Accessor for the Title object * - * @return Title object + * @return Title */ - function getTitle() { + public function getTitle() { return $this->mTitle; } /** * Accessor/mutator for the Title object * - * @param $x New Title object or null to just get the current one - * @return Title object + * @param Title $x Title object or null to just get the current one + * @return Title */ - function Title( $x = null ) { + public function Title( $x = null ) { return wfSetVar( $this->mTitle, $x ); } /** * Set the output type * - * @param $ot Integer: new value + * @param int $ot New value */ - function setOutputType( $ot ) { + public function setOutputType( $ot ) { $this->mOutputType = $ot; # Shortcut alias - $this->ot = array( + $this->ot = [ 'html' => $ot == self::OT_HTML, 'wiki' => $ot == self::OT_WIKI, 'pre' => $ot == self::OT_PREPROCESS, 'plain' => $ot == self::OT_PLAIN, - ); + ]; } /** * Accessor/mutator for the output type * - * @param $x New value or null to just get the current one - * @return Integer + * @param int|null $x New value or null to just get the current one + * @return int */ - function OutputType( $x = null ) { + public function OutputType( $x = null ) { return wfSetVar( $this->mOutputType, $x ); } /** * Get the ParserOutput object * - * @return ParserOutput object + * @return ParserOutput */ - function getOutput() { + public function getOutput() { return $this->mOutput; } /** * Get the ParserOptions object * - * @return ParserOptions object + * @return ParserOptions */ - function getOptions() { + public function getOptions() { return $this->mOptions; } /** * Accessor/mutator for the ParserOptions object * - * @param $x New value or null to just get the current one - * @return Current ParserOptions object + * @param ParserOptions $x New value or null to just get the current one + * @return ParserOptions Current ParserOptions object */ - function Options( $x = null ) { + public function Options( $x = null ) { return wfSetVar( $this->mOptions, $x ); } - function nextLinkID() { + /** + * @return int + */ + public function nextLinkID() { return $this->mLinkID++; } - function getFunctionLang() { - global $wgLang, $wgContLang; + /** + * @param int $id + */ + public function setLinkID( $id ) { + $this->mLinkID = $id; + } + + /** + * Get a language object for use in parser functions such as {{FORMATNUM:}} + * @return Language + */ + public function getFunctionLang() { + return $this->getTargetLanguage(); + } + /** + * Get the target language for the content being parsed. This is usually the + * language that the content is in. + * + * @since 1.19 + * + * @throws MWException + * @return Language + */ + public function getTargetLanguage() { $target = $this->mOptions->getTargetLanguage(); + if ( $target !== null ) { return $target; - } else { - return $this->mOptions->getInterfaceMessage() ? $wgLang : $wgContLang; + } elseif ( $this->mOptions->getInterfaceMessage() ) { + return $this->mOptions->getUserLangObj(); + } elseif ( is_null( $this->mTitle ) ) { + throw new MWException( __METHOD__ . ': $this->mTitle is null' ); + } + + return $this->mTitle->getPageLanguage(); + } + + /** + * Get the language object for language conversion + * @return Language|null + */ + public function getConverterLanguage() { + return $this->getTargetLanguage(); + } + + /** + * Get a User object either from $this->mUser, if set, or from the + * ParserOptions object otherwise + * + * @return User + */ + public function getUser() { + if ( !is_null( $this->mUser ) ) { + return $this->mUser; } + return $this->mOptions->getUser(); } /** * Get a preprocessor object * - * @return Preprocessor instance + * @return Preprocessor */ - function getPreprocessor() { + public function getPreprocessor() { if ( !isset( $this->mPreprocessor ) ) { $class = $this->mPreprocessorClass; $this->mPreprocessor = new $class( $this ); @@ -627,29 +916,47 @@ class Parser { return $this->mPreprocessor; } + /** + * Get a LinkRenderer instance to make links with + * + * @since 1.28 + * @return LinkRenderer + */ + public function getLinkRenderer() { + if ( !$this->mLinkRenderer ) { + $this->mLinkRenderer = MediaWikiServices::getInstance() + ->getLinkRendererFactory()->create(); + $this->mLinkRenderer->setStubThreshold( + $this->getOptions()->getStubThreshold() + ); + } + + return $this->mLinkRenderer; + } + /** * Replaces all occurrences of HTML-style comments and the given tags * in the text with a random marker and returns the next text. The output * parameter $matches will be an associative array filled with data in * the form: - * 'UNIQ-xxxxx' => array( + * + * @code + * 'UNIQ-xxxxx' => [ * 'element', * 'tag content', - * array( 'param' => 'x' ), - * 'tag content' ) ) + * [ 'param' => 'x' ], + * 'tag content' ] + * @endcode * - * @param $elements list of element names. Comments are always extracted. - * @param $text Source text string. - * @param $matches Out parameter, Array: extracted tags - * @param $uniq_prefix - * @return String: stripped text - * - * @static + * @param array $elements List of element names. Comments are always extracted. + * @param string $text Source text string. + * @param array &$matches Out parameter, Array: extracted tags + * @return string Stripped text */ - public function extractTagsAndParams( $elements, $text, &$matches, $uniq_prefix = '' ) { + public static function extractTagsAndParams( $elements, $text, &$matches ) { static $n = 1; $stripped = ''; - $matches = array(); + $matches = []; $taglist = implode( '|', $elements ); $start = "/<($taglist)(\\s+[^>]*?|\\s*?)(\/?" . ">)|<(!--)/i"; @@ -662,19 +969,19 @@ class Parser { } if ( count( $p ) > 5 ) { # comment - $element = $p[4]; + $element = $p[4]; $attributes = ''; - $close = ''; - $inside = $p[5]; + $close = ''; + $inside = $p[5]; } else { # tag - $element = $p[1]; + $element = $p[1]; $attributes = $p[2]; - $close = $p[3]; - $inside = $p[4]; + $close = $p[3]; + $inside = $p[4]; } - $marker = "$uniq_prefix-$element-" . sprintf( '%08X', $n++ ) . self::MARKER_SUFFIX; + $marker = self::MARKER_PREFIX . "-$element-" . sprintf( '%08X', $n++ ) . self::MARKER_SUFFIX; $stripped .= $marker; if ( $close === '/>' ) { @@ -700,127 +1007,88 @@ class Parser { } } - $matches[$marker] = array( $element, + $matches[$marker] = [ $element, $content, Sanitizer::decodeTagAttributes( $attributes ), - "<$element$attributes$close$content$tail" ); + "<$element$attributes$close$content$tail" ]; } return $stripped; } /** * Get a list of strippable XML-like elements + * + * @return array */ - function getStripList() { + public function getStripList() { return $this->mStripList; } /** - * @deprecated use replaceVariables - */ - function strip( $text, $state, $stripcomments = false , $dontstrip = array() ) { - return $text; - } - - /** - * Restores pre, math, and other extensions removed by strip() + * Add an item to the strip state + * Returns the unique tag which must be inserted into the stripped text + * The tag will be replaced with the original text in unstrip() * - * always call unstripNoWiki() after this one - * @private - * @deprecated use $this->mStripState->unstrip() + * @param string $text + * + * @return string */ - function unstrip( $text, $state ) { - return $state->unstripGeneral( $text ); + public function insertStripItem( $text ) { + $marker = self::MARKER_PREFIX . "-item-{$this->mMarkerIndex}-" . self::MARKER_SUFFIX; + $this->mMarkerIndex++; + $this->mStripState->addGeneral( $marker, $text ); + return $marker; } /** - * Always call this after unstrip() to preserve the order - * - * @private - * @deprecated use $this->mStripState->unstrip() - */ - function unstripNoWiki( $text, $state ) { - return $state->unstripNoWiki( $text ); - } - - /** - * @deprecated use $this->mStripState->unstripBoth() - */ - function unstripForHTML( $text ) { - return $this->mStripState->unstripBoth( $text ); - } - - /** - * Add an item to the strip state - * Returns the unique tag which must be inserted into the stripped text - * The tag will be replaced with the original text in unstrip() - * - * @private - */ - function insertStripItem( $text ) { - $rnd = "{$this->mUniqPrefix}-item-{$this->mMarkerIndex}-" . self::MARKER_SUFFIX; - $this->mMarkerIndex++; - $this->mStripState->general->setPair( $rnd, $text ); - return $rnd; - } - - /** - * Interface with html tidy - * @deprecated Use MWTidy::tidy() - */ - public static function tidy( $text ) { - wfDeprecated( __METHOD__ ); - return MWTidy::tidy( $text ); - } - - /** - * parse the wiki syntax used to render tables + * parse the wiki syntax used to render tables * * @private + * @param string $text + * @return string */ - function doTableStuff( $text ) { - wfProfileIn( __METHOD__ ); - + public function doTableStuff( $text ) { $lines = StringUtils::explode( "\n", $text ); $out = ''; - $td_history = array(); # Is currently a td tag open? - $last_tag_history = array(); # Save history of last lag activated (td, th or caption) - $tr_history = array(); # Is currently a tr tag open? - $tr_attributes = array(); # history of tr attributes - $has_opened_tr = array(); # Did this table open a element? + $td_history = []; # Is currently a td tag open? + $last_tag_history = []; # Save history of last lag activated (td, th or caption) + $tr_history = []; # Is currently a tr tag open? + $tr_attributes = []; # history of tr attributes + $has_opened_tr = []; # Did this table open a element? $indent_level = 0; # indent level of the table foreach ( $lines as $outLine ) { $line = trim( $outLine ); - if ( $line === '' ) { # empty line, go to next line - $out .= $outLine."\n"; + if ( $line === '' ) { # empty line, go to next line + $out .= $outLine . "\n"; continue; } $first_character = $line[0]; - $matches = array(); + $first_two = substr( $line, 0, 2 ); + $matches = []; - if ( preg_match( '/^(:*)\{\|(.*)$/', $line , $matches ) ) { + if ( preg_match( '/^(:*)\s*\{\|(.*)$/', $line, $matches ) ) { # First check if we are starting a new table $indent_level = strlen( $matches[1] ); $attributes = $this->mStripState->unstripBoth( $matches[2] ); - $attributes = Sanitizer::fixTagAttributes( $attributes , 'table' ); - - $outLine = str_repeat( '
' , $indent_level ) . ""; - array_push( $td_history , false ); - array_push( $last_tag_history , '' ); - array_push( $tr_history , false ); - array_push( $tr_attributes , '' ); - array_push( $has_opened_tr , false ); + $attributes = Sanitizer::fixTagAttributes( $attributes, 'table' ); + + $outLine = str_repeat( '
', $indent_level ) . ""; + array_push( $td_history, false ); + array_push( $last_tag_history, '' ); + array_push( $tr_history, false ); + array_push( $tr_attributes, '' ); + array_push( $has_opened_tr, false ); } elseif ( count( $td_history ) == 0 ) { # Don't do any of the following - $out .= $outLine."\n"; + $out .= $outLine . "\n"; continue; - } elseif ( substr( $line , 0 , 2 ) === '|}' ) { + } elseif ( $first_two === '|}' ) { # We are ending a table - $line = '' . substr( $line , 2 ); + $line = '' . substr( $line, 2 ); $last_tag = array_pop( $last_tag_history ); if ( !array_pop( $has_opened_tr ) ) { @@ -835,8 +1103,8 @@ class Parser { $line = "{$line}"; } array_pop( $tr_attributes ); - $outLine = $line . str_repeat( '
' , $indent_level ); - } elseif ( substr( $line , 0 , 2 ) === '|-' ) { + $outLine = $line . str_repeat( '
', $indent_level ); + } elseif ( $first_two === '|-' ) { # Now we have a table row $line = preg_replace( '#^\|-+#', '', $line ); @@ -849,7 +1117,7 @@ class Parser { $line = ''; $last_tag = array_pop( $last_tag_history ); array_pop( $has_opened_tr ); - array_push( $has_opened_tr , true ); + array_push( $has_opened_tr, true ); if ( array_pop( $tr_history ) ) { $line = ''; @@ -860,27 +1128,30 @@ class Parser { } $outLine = $line; - array_push( $tr_history , false ); - array_push( $td_history , false ); - array_push( $last_tag_history , '' ); - } elseif ( $first_character === '|' || $first_character === '!' || substr( $line , 0 , 2 ) === '|+' ) { + array_push( $tr_history, false ); + array_push( $td_history, false ); + array_push( $last_tag_history, '' ); + } elseif ( $first_character === '|' + || $first_character === '!' + || $first_two === '|+' + ) { # This might be cell elements, td, th or captions - if ( substr( $line , 0 , 2 ) === '|+' ) { + if ( $first_two === '|+' ) { $first_character = '+'; - $line = substr( $line , 1 ); + $line = substr( $line, 2 ); + } else { + $line = substr( $line, 1 ); } - $line = substr( $line , 1 ); - + // Implies both are valid for table headings. if ( $first_character === '!' ) { - $line = str_replace( '!!' , '||' , $line ); + $line = StringUtils::replaceMarkup( '!!', '||', $line ); } # Split up multiple cells on the same line. # FIXME : This can result in improper nesting of tags processed - # by earlier parser steps, but should avoid splitting up eg - # attribute values containing literal "||". - $cells = StringUtils::explodeMarkup( '||' , $line ); + # by earlier parser steps. + $cells = explode( '||', $line ); $outLine = ''; @@ -892,10 +1163,10 @@ class Parser { if ( !array_pop( $tr_history ) ) { $previous = "\n"; } - array_push( $tr_history , true ); - array_push( $tr_attributes , '' ); + array_push( $tr_history, true ); + array_push( $tr_attributes, '' ); array_pop( $has_opened_tr ); - array_push( $has_opened_tr , true ); + array_push( $has_opened_tr, true ); } $last_tag = array_pop( $last_tag_history ); @@ -914,25 +1185,26 @@ class Parser { $last_tag = ''; } - array_push( $last_tag_history , $last_tag ); + array_push( $last_tag_history, $last_tag ); # A cell could contain both parameters and data - $cell_data = explode( '|' , $cell , 2 ); + $cell_data = explode( '|', $cell, 2 ); - # Bug 553: Note that a '|' inside an invalid link should not + # T2553: Note that a '|' inside an invalid link should not # be mistaken as delimiting cell parameters - if ( strpos( $cell_data[0], '[[' ) !== false ) { + # Bug T153140: Neither should language converter markup. + if ( preg_match( '/\[\[|-\{/', $cell_data[0] ) === 1 ) { $cell = "{$previous}<{$last_tag}>{$cell}"; } elseif ( count( $cell_data ) == 1 ) { $cell = "{$previous}<{$last_tag}>{$cell_data[0]}"; } else { $attributes = $this->mStripState->unstripBoth( $cell_data[0] ); - $attributes = Sanitizer::fixTagAttributes( $attributes , $last_tag ); + $attributes = Sanitizer::fixTagAttributes( $attributes, $last_tag ); $cell = "{$previous}<{$last_tag}{$attributes}>{$cell_data[1]}"; } $outLine .= $cell; - array_push( $td_history , true ); + array_push( $td_history, true ); } } $out .= $outLine . "\n"; @@ -947,7 +1219,7 @@ class Parser { $out .= "\n"; } if ( !array_pop( $has_opened_tr ) ) { - $out .= "\n" ; + $out .= "\n"; } $out .= "\n"; @@ -963,26 +1235,30 @@ class Parser { $out = ''; } - wfProfileOut( __METHOD__ ); - return $out; } /** - * Helper function for parse() that transforms wiki markup into + * Helper function for parse() that transforms wiki markup into half-parsed * HTML. Only called for $mOutputType == self::OT_HTML. * * @private + * + * @param string $text The text to parse + * @param bool $isMain Whether this is being called from the main parse() function + * @param PPFrame|bool $frame A pre-processor frame + * + * @return string */ - function internalParse( $text, $isMain = true, $frame=false ) { - wfProfileIn( __METHOD__ ); - + public function internalParse( $text, $isMain = true, $frame = false ) { $origText = $text; + // Avoid PHP 7.1 warning from passing $this by reference + $parser = $this; + # Hook to suspend the parser in this state - if ( !wfRunHooks( 'ParserBeforeInternalParse', array( &$this, &$text, &$this->mStripState ) ) ) { - wfProfileOut( __METHOD__ ); - return $text ; + if ( !Hooks::run( 'ParserBeforeInternalParse', [ &$parser, &$text, &$this->mStripState ] ) ) { + return $text; } # if $frame is provided, then use $frame for replacing any variables @@ -992,7 +1268,7 @@ class Parser { if ( !$frame->depth ) { $flag = 0; } else { - $flag = Parser::PTD_FOR_INCLUSION; + $flag = self::PTD_FOR_INCLUSION; } $dom = $this->preprocessToDom( $text, $flag ); $text = $frame->expand( $dom ); @@ -1001,8 +1277,16 @@ class Parser { $text = $this->replaceVariables( $text ); } - $text = Sanitizer::removeHTMLtags( $text, array( &$this, 'attributeStripCallback' ), false, array_keys( $this->mTransparentTagHooks ) ); - wfRunHooks( 'InternalParseBeforeLinks', array( &$this, &$text, &$this->mStripState ) ); + Hooks::run( 'InternalParseBeforeSanitize', [ &$parser, &$text, &$this->mStripState ] ); + $text = Sanitizer::removeHTMLtags( + $text, + [ $this, 'attributeStripCallback' ], + false, + array_keys( $this->mTransparentTagHooks ), + [], + [ $this, 'addTrackingCategory' ] + ); + Hooks::run( 'InternalParseBeforeLinks', [ &$parser, &$text, &$this->mStripState ] ); # Tables need to come after variable replacement for things to work # properly; putting them before other transformations should keep @@ -1015,22 +1299,119 @@ class Parser { $text = $this->doDoubleUnderscore( $text ); $text = $this->doHeadings( $text ); - if ( $this->mOptions->getUseDynamicDates() ) { - $df = DateFormatter::getInstance(); - $text = $df->reformat( $this->mOptions->getDateFormat(), $text ); - } $text = $this->replaceInternalLinks( $text ); $text = $this->doAllQuotes( $text ); $text = $this->replaceExternalLinks( $text ); # replaceInternalLinks may sometimes leave behind # absolute URLs, which have to be masked to hide them from replaceExternalLinks - $text = str_replace( $this->mUniqPrefix.'NOPARSE', '', $text ); + $text = str_replace( self::MARKER_PREFIX . 'NOPARSE', '', $text ); $text = $this->doMagicLinks( $text ); $text = $this->formatHeadings( $text, $origText, $isMain ); - wfProfileOut( __METHOD__ ); + return $text; + } + + /** + * Helper function for parse() that transforms half-parsed HTML into fully + * parsed HTML. + * + * @param string $text + * @param bool $isMain + * @param bool $linestart + * @return string + */ + private function internalParseHalfParsed( $text, $isMain = true, $linestart = true ) { + $text = $this->mStripState->unstripGeneral( $text ); + + // Avoid PHP 7.1 warning from passing $this by reference + $parser = $this; + + if ( $isMain ) { + Hooks::run( 'ParserAfterUnstrip', [ &$parser, &$text ] ); + } + + # Clean up special characters, only run once, next-to-last before doBlockLevels + $fixtags = [ + # French spaces, last one Guillemet-left + # only if there is something before the space + '/(.) (?=\\?|:|;|!|%|\\302\\273)/' => '\\1 ', + # french spaces, Guillemet-right + '/(\\302\\253) /' => '\\1 ', + '/ (!\s*important)/' => ' \\1', # Beware of CSS magic word !important, T13874. + ]; + $text = preg_replace( array_keys( $fixtags ), array_values( $fixtags ), $text ); + + $text = $this->doBlockLevels( $text, $linestart ); + + $this->replaceLinkHolders( $text ); + + /** + * The input doesn't get language converted if + * a) It's disabled + * b) Content isn't converted + * c) It's a conversion table + * d) it is an interface message (which is in the user language) + */ + if ( !( $this->mOptions->getDisableContentConversion() + || isset( $this->mDoubleUnderscores['nocontentconvert'] ) ) + ) { + if ( !$this->mOptions->getInterfaceMessage() ) { + # The position of the convert() call should not be changed. it + # assumes that the links are all replaced and the only thing left + # is the mark. + $text = $this->getConverterLanguage()->convert( $text ); + } + } + + $text = $this->mStripState->unstripNoWiki( $text ); + + if ( $isMain ) { + Hooks::run( 'ParserBeforeTidy', [ &$parser, &$text ] ); + } + + $text = $this->replaceTransparentTags( $text ); + $text = $this->mStripState->unstripGeneral( $text ); + + $text = Sanitizer::normalizeCharReferences( $text ); + + if ( MWTidy::isEnabled() ) { + if ( $this->mOptions->getTidy() ) { + $text = MWTidy::tidy( $text ); + } + } else { + # attempt to sanitize at least some nesting problems + # (T4702 and quite a few others) + $tidyregs = [ + # ''Something [http://www.cool.com cool''] --> + # Somethingcool> + '/(<([bi])>)(<([bi])>)?([^<]*)(<\/?a[^<]*>)([^<]*)(<\/\\4>)?(<\/\\2>)/' => + '\\1\\3\\5\\8\\9\\6\\1\\3\\7\\8\\9', + # fix up an anchor inside another anchor, only + # at least for a single single nested link (T5695) + '/(]+>)([^<]*)(]+>[^<]*)<\/a>(.*)<\/a>/' => + '\\1\\2\\3\\1\\4', + # fix div inside inline elements- doBlockLevels won't wrap a line which + # contains a div, so fix it up here; replace + # div with escaped text + '/(<([aib]) [^>]+>)([^<]*)(]*)>)(.*)(<\/div>)([^<]*)(<\/\\2>)/' => + '\\1\\3<div\\5>\\6</div>\\8\\9', + # remove empty italic or bold tag pairs, some + # introduced by rules above + '/<([bi])><\/\\1>/' => '', + ]; + + $text = preg_replace( + array_keys( $tidyregs ), + array_values( $tidyregs ), + $text ); + } + + if ( $isMain ) { + Hooks::run( 'ParserAfterTidy', [ &$parser, &$text ] ); + } + return $text; } @@ -1040,28 +1421,43 @@ class Parser { * * DML * @private + * + * @param string $text + * + * @return string */ - function doMagicLinks( $text ) { - wfProfileIn( __METHOD__ ); - $prots = $this->mUrlProtocols; + public function doMagicLinks( $text ) { + $prots = wfUrlProtocolsWithoutProtRel(); $urlChar = self::EXT_LINK_URL_CLASS; + $addr = self::EXT_LINK_ADDR; + $space = self::SPACE_NOT_NL; # non-newline space + $spdash = "(?:-|$space)"; # a dash or a non-newline space + $spaces = "$space++"; # possessive match of 1 or more spaces $text = preg_replace_callback( - '!(?: # Start cases - (].*?) | # m[1]: Skip link text - (<.*?>) | # m[2]: Skip stuff inside HTML elements' . " - (\\b(?:$prots)$urlChar+) | # m[3]: Free external links" . ' - (?:RFC|PMID)\s+([0-9]+) | # m[4]: RFC or PMID, capture number - ISBN\s+(\b # m[5]: ISBN, capture number - (?: 97[89] [\ \-]? )? # optional 13-digit ISBN prefix - (?: [0-9] [\ \-]? ){9} # 9 digits with opt. delimiters - [0-9Xx] # check digit - \b) - )!x', array( &$this, 'magicLinkCallback' ), $text ); - wfProfileOut( __METHOD__ ); + '!(?: # Start cases + (].*?) | # m[1]: Skip link text + (<.*?>) | # m[2]: Skip stuff inside HTML elements' . " + (\b # m[3]: Free external links + (?i:$prots) + ($addr$urlChar*) # m[4]: Post-protocol path + ) | + \b(?:RFC|PMID) $spaces # m[5]: RFC or PMID, capture number + ([0-9]+)\b | + \bISBN $spaces ( # m[6]: ISBN, capture number + (?: 97[89] $spdash? )? # optional 13-digit ISBN prefix + (?: [0-9] $spdash? ){9} # 9 digits with opt. delimiters + [0-9Xx] # check digit + )\b + )!xu", [ $this, 'magicLinkCallback' ], $text ); return $text; } - function magicLinkCallback( $m ) { + /** + * @throws MWException + * @param array $m + * @return HTML|string + */ + public function magicLinkCallback( $m ) { if ( isset( $m[1] ) && $m[1] !== '' ) { # Skip anchor return $m[0]; @@ -1070,39 +1466,55 @@ class Parser { return $m[0]; } elseif ( isset( $m[3] ) && $m[3] !== '' ) { # Free external link - return $this->makeFreeExternalLink( $m[0] ); - } elseif ( isset( $m[4] ) && $m[4] !== '' ) { + return $this->makeFreeExternalLink( $m[0], strlen( $m[4] ) ); + } elseif ( isset( $m[5] ) && $m[5] !== '' ) { # RFC or PMID if ( substr( $m[0], 0, 3 ) === 'RFC' ) { + if ( !$this->mOptions->getMagicRFCLinks() ) { + return $m[0]; + } $keyword = 'RFC'; $urlmsg = 'rfcurl'; - $CssClass = 'mw-magiclink-rfc'; - $id = $m[4]; + $cssClass = 'mw-magiclink-rfc'; + $trackingCat = 'magiclink-tracking-rfc'; + $id = $m[5]; } elseif ( substr( $m[0], 0, 4 ) === 'PMID' ) { + if ( !$this->mOptions->getMagicPMIDLinks() ) { + return $m[0]; + } $keyword = 'PMID'; $urlmsg = 'pubmedurl'; - $CssClass = 'mw-magiclink-pmid'; - $id = $m[4]; + $cssClass = 'mw-magiclink-pmid'; + $trackingCat = 'magiclink-tracking-pmid'; + $id = $m[5]; } else { - throw new MWException( __METHOD__.': unrecognised match type "' . + throw new MWException( __METHOD__ . ': unrecognised match type "' . substr( $m[0], 0, 20 ) . '"' ); } - $url = wfMsgForContent( $urlmsg, $id); - $sk = $this->mOptions->getSkin( $this->mTitle ); - $la = $sk->getExternalLinkAttributes( "external $CssClass" ); - return "{$keyword} {$id}"; - } elseif ( isset( $m[5] ) && $m[5] !== '' ) { + $url = wfMessage( $urlmsg, $id )->inContentLanguage()->text(); + $this->addTrackingCategory( $trackingCat ); + return Linker::makeExternalLink( $url, "{$keyword} {$id}", true, $cssClass, [], $this->mTitle ); + } elseif ( isset( $m[6] ) && $m[6] !== '' + && $this->mOptions->getMagicISBNLinks() + ) { # ISBN - $isbn = $m[5]; - $num = strtr( $isbn, array( + $isbn = $m[6]; + $space = self::SPACE_NOT_NL; # non-newline space + $isbn = preg_replace( "/$space/", ' ', $isbn ); + $num = strtr( $isbn, [ '-' => '', ' ' => '', 'x' => 'X', - )); - $titleObj = SpecialPage::getTitleFor( 'Booksources', $num ); - return'ISBN $isbn"; + ] ); + $this->addTrackingCategory( 'magiclink-tracking-isbn' ); + return $this->getLinkRenderer()->makeKnownLink( + SpecialPage::getTitleFor( 'Booksources', $num ), + "ISBN $isbn", + [ + 'class' => 'internal mw-magiclink-isbn', + 'title' => false // suppress title attribute + ] + ); } else { return $m[0]; } @@ -1110,21 +1522,27 @@ class Parser { /** * Make a free external link, given a user-supplied URL - * @return HTML + * + * @param string $url + * @param int $numPostProto + * The number of characters after the protocol. + * @return string HTML * @private */ - function makeFreeExternalLink( $url ) { - global $wgContLang; - wfProfileIn( __METHOD__ ); - - $sk = $this->mOptions->getSkin( $this->mTitle ); + public function makeFreeExternalLink( $url, $numPostProto ) { $trail = ''; # The characters '<' and '>' (which were escaped by # removeHTMLtags()) should not be included in # URLs, per RFC 2396. - $m2 = array(); - if ( preg_match( '/&(lt|gt);/', $url, $m2, PREG_OFFSET_CAPTURE ) ) { + # Make   terminate a URL as well (bug T84937) + $m2 = []; + if ( preg_match( + '/&(lt|gt|nbsp|#x0*(3[CcEe]|[Aa]0)|#0*(60|62|160));/', + $url, + $m2, + PREG_OFFSET_CAPTURE + ) ) { $trail = substr( $url, $m2[0][1] ) . $trail; $url = substr( $url, 0, $m2[0][1] ); } @@ -1136,250 +1554,296 @@ class Parser { $sep .= ')'; } - $numSepChars = strspn( strrev( $url ), $sep ); + $urlRev = strrev( $url ); + $numSepChars = strspn( $urlRev, $sep ); + # Don't break a trailing HTML entity by moving the ; into $trail + # This is in hot code, so use substr_compare to avoid having to + # create a new string object for the comparison + if ( $numSepChars && substr_compare( $url, ";", -$numSepChars, 1 ) === 0 ) { + # more optimization: instead of running preg_match with a $ + # anchor, which can be slow, do the match on the reversed + # string starting at the desired offset. + # un-reversed regexp is: /&([a-z]+|#x[\da-f]+|#\d+)$/i + if ( preg_match( '/\G([a-z]+|[\da-f]+x#|\d+#)&/i', $urlRev, $m2, 0, $numSepChars ) ) { + $numSepChars--; + } + } if ( $numSepChars ) { $trail = substr( $url, -$numSepChars ) . $trail; $url = substr( $url, 0, -$numSepChars ); } + # Verify that we still have a real URL after trail removal, and + # not just lone protocol + if ( strlen( $trail ) >= $numPostProto ) { + return $url . $trail; + } + $url = Sanitizer::cleanUrl( $url ); # Is this an external image? $text = $this->maybeMakeExternalImage( $url ); if ( $text === false ) { # Not an image, make a link - $text = $sk->makeExternalLink( $url, $wgContLang->markNoConversion($url), true, 'free', - $this->getExternalLinkAttribs( $url ) ); + $text = Linker::makeExternalLink( $url, + $this->getConverterLanguage()->markNoConversion( $url, true ), + true, 'free', + $this->getExternalLinkAttribs( $url ), $this->mTitle ); # Register it in the output object... - # Replace unnecessary URL escape codes with their equivalent characters - $pasteurized = self::replaceUnusualEscapes( $url ); - $this->mOutput->addExternalLink( $pasteurized ); + $this->mOutput->addExternalLink( $url ); } - wfProfileOut( __METHOD__ ); return $text . $trail; } - /** * Parse headers and return html * * @private + * + * @param string $text + * + * @return string */ - function doHeadings( $text ) { - wfProfileIn( __METHOD__ ); + public function doHeadings( $text ) { for ( $i = 6; $i >= 1; --$i ) { $h = str_repeat( '=', $i ); - $text = preg_replace( "/^$h(.+)$h\\s*$/m", - "\\1", $text ); + $text = preg_replace( "/^$h(.+)$h\\s*$/m", "\\1", $text ); } - wfProfileOut( __METHOD__ ); return $text; } /** * Replace single quotes with HTML markup * @private - * @return string the altered text + * + * @param string $text + * + * @return string The altered text */ - function doAllQuotes( $text ) { - wfProfileIn( __METHOD__ ); + public function doAllQuotes( $text ) { $outtext = ''; $lines = StringUtils::explode( "\n", $text ); foreach ( $lines as $line ) { $outtext .= $this->doQuotes( $line ) . "\n"; } - $outtext = substr( $outtext, 0,-1 ); - wfProfileOut( __METHOD__ ); + $outtext = substr( $outtext, 0, -1 ); return $outtext; } /** * Helper function for doAllQuotes() + * + * @param string $text + * + * @return string */ public function doQuotes( $text ) { $arr = preg_split( "/(''+)/", $text, -1, PREG_SPLIT_DELIM_CAPTURE ); - if ( count( $arr ) == 1 ) { + $countarr = count( $arr ); + if ( $countarr == 1 ) { return $text; - } else { - # First, do some preliminary work. This may shift some apostrophes from - # being mark-up to being text. It also counts the number of occurrences - # of bold and italics mark-ups. - $numbold = 0; - $numitalics = 0; - for ( $i = 0; $i < count( $arr ); $i++ ) { - if ( ( $i % 2 ) == 1 ) { - # If there are ever four apostrophes, assume the first is supposed to - # be text, and the remaining three constitute mark-up for bold text. - if ( strlen( $arr[$i] ) == 4 ) { - $arr[$i-1] .= "'"; - $arr[$i] = "'''"; - } elseif ( strlen( $arr[$i] ) > 5 ) { - # If there are more than 5 apostrophes in a row, assume they're all - # text except for the last 5. - $arr[$i-1] .= str_repeat( "'", strlen( $arr[$i] ) - 5 ); - $arr[$i] = "'''''"; - } - # Count the number of occurrences of bold and italics mark-ups. - # We are not counting sequences of five apostrophes. - if ( strlen( $arr[$i] ) == 2 ) { - $numitalics++; - } elseif ( strlen( $arr[$i] ) == 3 ) { - $numbold++; - } elseif ( strlen( $arr[$i] ) == 5 ) { - $numitalics++; - $numbold++; - } - } + } + + // First, do some preliminary work. This may shift some apostrophes from + // being mark-up to being text. It also counts the number of occurrences + // of bold and italics mark-ups. + $numbold = 0; + $numitalics = 0; + for ( $i = 1; $i < $countarr; $i += 2 ) { + $thislen = strlen( $arr[$i] ); + // If there are ever four apostrophes, assume the first is supposed to + // be text, and the remaining three constitute mark-up for bold text. + // (T15227: ''''foo'''' turns into ' ''' foo ' ''') + if ( $thislen == 4 ) { + $arr[$i - 1] .= "'"; + $arr[$i] = "'''"; + $thislen = 3; + } elseif ( $thislen > 5 ) { + // If there are more than 5 apostrophes in a row, assume they're all + // text except for the last 5. + // (T15227: ''''''foo'''''' turns into ' ''''' foo ' ''''') + $arr[$i - 1] .= str_repeat( "'", $thislen - 5 ); + $arr[$i] = "'''''"; + $thislen = 5; + } + // Count the number of occurrences of bold and italics mark-ups. + if ( $thislen == 2 ) { + $numitalics++; + } elseif ( $thislen == 3 ) { + $numbold++; + } elseif ( $thislen == 5 ) { + $numitalics++; + $numbold++; } + } - # If there is an odd number of both bold and italics, it is likely - # that one of the bold ones was meant to be an apostrophe followed - # by italics. Which one we cannot know for certain, but it is more - # likely to be one that has a single-letter word before it. - if ( ( $numbold % 2 == 1 ) && ( $numitalics % 2 == 1 ) ) { - $i = 0; - $firstsingleletterword = -1; - $firstmultiletterword = -1; - $firstspace = -1; - foreach ( $arr as $r ) { - if ( ( $i % 2 == 1 ) and ( strlen( $r ) == 3 ) ) { - $x1 = substr( $arr[$i-1], -1 ); - $x2 = substr( $arr[$i-1], -2, 1 ); - if ( $x1 === ' ' ) { - if ( $firstspace == -1 ) { - $firstspace = $i; - } - } elseif ( $x2 === ' ') { - if ( $firstsingleletterword == -1 ) { - $firstsingleletterword = $i; - } - } else { - if ( $firstmultiletterword == -1 ) { - $firstmultiletterword = $i; - } + // If there is an odd number of both bold and italics, it is likely + // that one of the bold ones was meant to be an apostrophe followed + // by italics. Which one we cannot know for certain, but it is more + // likely to be one that has a single-letter word before it. + if ( ( $numbold % 2 == 1 ) && ( $numitalics % 2 == 1 ) ) { + $firstsingleletterword = -1; + $firstmultiletterword = -1; + $firstspace = -1; + for ( $i = 1; $i < $countarr; $i += 2 ) { + if ( strlen( $arr[$i] ) == 3 ) { + $x1 = substr( $arr[$i - 1], -1 ); + $x2 = substr( $arr[$i - 1], -2, 1 ); + if ( $x1 === ' ' ) { + if ( $firstspace == -1 ) { + $firstspace = $i; + } + } elseif ( $x2 === ' ' ) { + $firstsingleletterword = $i; + // if $firstsingleletterword is set, we don't + // look at the other options, so we can bail early. + break; + } else { + if ( $firstmultiletterword == -1 ) { + $firstmultiletterword = $i; } } - $i++; } + } - # If there is a single-letter word, use it! - if ( $firstsingleletterword > -1 ) { - $arr[$firstsingleletterword] = "''"; - $arr[$firstsingleletterword-1] .= "'"; - } elseif ( $firstmultiletterword > -1 ) { - # If not, but there's a multi-letter word, use that one. - $arr[$firstmultiletterword] = "''"; - $arr[$firstmultiletterword-1] .= "'"; - } elseif ( $firstspace > -1 ) { - # ... otherwise use the first one that has neither. - # (notice that it is possible for all three to be -1 if, for example, - # there is only one pentuple-apostrophe in the line) - $arr[$firstspace] = "''"; - $arr[$firstspace-1] .= "'"; - } + // If there is a single-letter word, use it! + if ( $firstsingleletterword > -1 ) { + $arr[$firstsingleletterword] = "''"; + $arr[$firstsingleletterword - 1] .= "'"; + } elseif ( $firstmultiletterword > -1 ) { + // If not, but there's a multi-letter word, use that one. + $arr[$firstmultiletterword] = "''"; + $arr[$firstmultiletterword - 1] .= "'"; + } elseif ( $firstspace > -1 ) { + // ... otherwise use the first one that has neither. + // (notice that it is possible for all three to be -1 if, for example, + // there is only one pentuple-apostrophe in the line) + $arr[$firstspace] = "''"; + $arr[$firstspace - 1] .= "'"; } + } - # Now let's actually convert our apostrophic mush to HTML! - $output = ''; - $buffer = ''; - $state = ''; - $i = 0; - foreach ( $arr as $r ) { - if ( ( $i % 2 ) == 0 ) { - if ( $state === 'both' ) { - $buffer .= $r; - } else { - $output .= $r; - } + // Now let's actually convert our apostrophic mush to HTML! + $output = ''; + $buffer = ''; + $state = ''; + $i = 0; + foreach ( $arr as $r ) { + if ( ( $i % 2 ) == 0 ) { + if ( $state === 'both' ) { + $buffer .= $r; } else { - if ( strlen( $r ) == 2 ) { - if ( $state === 'i' ) { - $output .= ''; $state = ''; - } elseif ( $state === 'bi' ) { - $output .= ''; $state = 'b'; - } elseif ( $state === 'ib' ) { - $output .= ''; $state = 'b'; - } elseif ( $state === 'both' ) { - $output .= ''.$buffer.''; $state = 'b'; - } else { # $state can be 'b' or '' - $output .= ''; $state .= 'i'; - } - } elseif ( strlen( $r ) == 3 ) { - if ( $state === 'b' ) { - $output .= ''; $state = ''; - } elseif ( $state === 'bi' ) { - $output .= ''; $state = 'i'; - } elseif ( $state === 'ib' ) { - $output .= ''; $state = 'i'; - } elseif ( $state === 'both' ) { - $output .= ''.$buffer.''; $state = 'i'; - } else { # $state can be 'i' or '' - $output .= ''; $state .= 'b'; - } - } elseif ( strlen( $r ) == 5 ) { - if ( $state === 'b' ) { - $output .= ''; $state = 'i'; - } elseif ( $state === 'i' ) { - $output .= ''; $state = 'b'; - } elseif ( $state === 'bi' ) { - $output .= ''; $state = ''; - } elseif ( $state === 'ib' ) { - $output .= ''; $state = ''; - } elseif ( $state === 'both' ) { - $output .= ''.$buffer.''; $state = ''; - } else { # ($state == '') - $buffer = ''; $state = 'both'; - } + $output .= $r; + } + } else { + $thislen = strlen( $r ); + if ( $thislen == 2 ) { + if ( $state === 'i' ) { + $output .= ''; + $state = ''; + } elseif ( $state === 'bi' ) { + $output .= ''; + $state = 'b'; + } elseif ( $state === 'ib' ) { + $output .= ''; + $state = 'b'; + } elseif ( $state === 'both' ) { + $output .= '' . $buffer . ''; + $state = 'b'; + } else { // $state can be 'b' or '' + $output .= ''; + $state .= 'i'; + } + } elseif ( $thislen == 3 ) { + if ( $state === 'b' ) { + $output .= ''; + $state = ''; + } elseif ( $state === 'bi' ) { + $output .= ''; + $state = 'i'; + } elseif ( $state === 'ib' ) { + $output .= ''; + $state = 'i'; + } elseif ( $state === 'both' ) { + $output .= '' . $buffer . ''; + $state = 'i'; + } else { // $state can be 'i' or '' + $output .= ''; + $state .= 'b'; + } + } elseif ( $thislen == 5 ) { + if ( $state === 'b' ) { + $output .= ''; + $state = 'i'; + } elseif ( $state === 'i' ) { + $output .= ''; + $state = 'b'; + } elseif ( $state === 'bi' ) { + $output .= ''; + $state = ''; + } elseif ( $state === 'ib' ) { + $output .= ''; + $state = ''; + } elseif ( $state === 'both' ) { + $output .= '' . $buffer . ''; + $state = ''; + } else { // ($state == '') + $buffer = ''; + $state = 'both'; } } - $i++; - } - # Now close all remaining tags. Notice that the order is important. - if ( $state === 'b' || $state === 'ib' ) { - $output .= ''; - } - if ( $state === 'i' || $state === 'bi' || $state === 'ib' ) { - $output .= ''; } - if ( $state === 'bi' ) { - $output .= ''; - } - # There might be lonely ''''', so make sure we have a buffer - if ( $state === 'both' && $buffer ) { - $output .= ''.$buffer.''; - } - return $output; + $i++; + } + // Now close all remaining tags. Notice that the order is important. + if ( $state === 'b' || $state === 'ib' ) { + $output .= ''; + } + if ( $state === 'i' || $state === 'bi' || $state === 'ib' ) { + $output .= ''; } + if ( $state === 'bi' ) { + $output .= ''; + } + // There might be lonely ''''', so make sure we have a buffer + if ( $state === 'both' && $buffer ) { + $output .= '' . $buffer . ''; + } + return $output; } /** * Replace external links (REL) * - * Note: this is all very hackish and the order of execution matters a lot. - * Make sure to run maintenance/parserTests.php if you change this code. + * Note: this is all very hackish and the order of execution matters a lot. + * Make sure to run tests/parser/parserTests.php if you change this code. * * @private + * + * @param string $text + * + * @throws MWException + * @return string */ - function replaceExternalLinks( $text ) { - global $wgContLang; - wfProfileIn( __METHOD__ ); - - $sk = $this->mOptions->getSkin( $this->mTitle ); - + public function replaceExternalLinks( $text ) { $bits = preg_split( $this->mExtLinkBracketedRegex, $text, -1, PREG_SPLIT_DELIM_CAPTURE ); + if ( $bits === false ) { + throw new MWException( "PCRE needs to be compiled with " + . "--enable-unicode-properties in order for MediaWiki to function" ); + } $s = array_shift( $bits ); $i = 0; - while ( $i' (which were escaped by # removeHTMLtags()) should not be included in # URLs, per RFC 2396. - $m2 = array(); + $m2 = []; if ( preg_match( '/&(lt|gt);/', $url, $m2, PREG_OFFSET_CAPTURE ) ) { $text = substr( $url, $m2[0][1] ) . ' ' . $text; $url = substr( $url, 0, $m2[0][1] ); @@ -1399,23 +1863,17 @@ class Parser { # No link text, e.g. [http://domain.tld/some.link] if ( $text == '' ) { - # Autonumber if allowed. See bug #5918 - if ( strpos( wfUrlProtocols(), substr( $protocol, 0, strpos( $protocol, ':' ) ) ) !== false ) { - $langObj = $this->getFunctionLang(); - $text = '[' . $langObj->formatNum( ++$this->mAutonumber ) . ']'; - $linktype = 'autonumber'; - } else { - # Otherwise just use the URL - $text = htmlspecialchars( $url ); - $linktype = 'free'; - } + # Autonumber + $langObj = $this->getTargetLanguage(); + $text = '[' . $langObj->formatNum( ++$this->mAutonumber ) . ']'; + $linktype = 'autonumber'; } else { # Have link text, e.g. [http://domain.tld/some.link text]s # Check for trail list( $dtrail, $trail ) = Linker::splitTrail( $trail ); } - $text = $wgContLang->markNoConversion( $text ); + $text = $this->getConverterLanguage()->markNoConversion( $text ); $url = Sanitizer::cleanUrl( $url ); @@ -1423,97 +1881,136 @@ class Parser { # This means that users can paste URLs directly into the text # Funny characters like ö aren't valid in URLs anyway # This was changed in August 2004 - $s .= $sk->makeExternalLink( $url, $text, false, $linktype, - $this->getExternalLinkAttribs( $url ) ) . $dtrail . $trail; + $s .= Linker::makeExternalLink( $url, $text, false, $linktype, + $this->getExternalLinkAttribs( $url ), $this->mTitle ) . $dtrail . $trail; # Register link in the output object. - # Replace unnecessary URL escape codes with the referenced character - # This prevents spammers from hiding links from the filters - $pasteurized = self::replaceUnusualEscapes( $url ); - $this->mOutput->addExternalLink( $pasteurized ); + $this->mOutput->addExternalLink( $url ); } - wfProfileOut( __METHOD__ ); return $s; } + /** + * Get the rel attribute for a particular external link. + * + * @since 1.21 + * @param string|bool $url Optional URL, to extract the domain from for rel => + * nofollow if appropriate + * @param Title $title Optional Title, for wgNoFollowNsExceptions lookups + * @return string|null Rel attribute for $url + */ + public static function getExternalLinkRel( $url = false, $title = null ) { + global $wgNoFollowLinks, $wgNoFollowNsExceptions, $wgNoFollowDomainExceptions; + $ns = $title ? $title->getNamespace() : false; + if ( $wgNoFollowLinks && !in_array( $ns, $wgNoFollowNsExceptions ) + && !wfMatchesDomainList( $url, $wgNoFollowDomainExceptions ) + ) { + return 'nofollow'; + } + return null; + } + /** * Get an associative array of additional HTML attributes appropriate for a * particular external link. This currently may include rel => nofollow * (depending on configuration, namespace, and the URL's domain) and/or a * target attribute (depending on configuration). * - * @param $url String: optional URL, to extract the domain from for rel => + * @param string $url URL to extract the domain from for rel => * nofollow if appropriate - * @return Array: associative array of HTML attributes - */ - function getExternalLinkAttribs( $url = false ) { - $attribs = array(); - global $wgNoFollowLinks, $wgNoFollowNsExceptions; - $ns = $this->mTitle->getNamespace(); - if ( $wgNoFollowLinks && !in_array( $ns, $wgNoFollowNsExceptions ) ) { - $attribs['rel'] = 'nofollow'; - - global $wgNoFollowDomainExceptions; - if ( $wgNoFollowDomainExceptions ) { - $bits = wfParseUrl( $url ); - if ( is_array( $bits ) && isset( $bits['host'] ) ) { - foreach ( $wgNoFollowDomainExceptions as $domain ) { - if ( substr( $bits['host'], -strlen( $domain ) ) == $domain ) { - unset( $attribs['rel'] ); - break; - } - } + * @return array Associative array of HTML attributes + */ + public function getExternalLinkAttribs( $url ) { + $attribs = []; + $rel = self::getExternalLinkRel( $url, $this->mTitle ); + + $target = $this->mOptions->getExternalLinkTarget(); + if ( $target ) { + $attribs['target'] = $target; + if ( !in_array( $target, [ '_self', '_parent', '_top' ] ) ) { + // T133507. New windows can navigate parent cross-origin. + // Including noreferrer due to lacking browser + // support of noopener. Eventually noreferrer should be removed. + if ( $rel !== '' ) { + $rel .= ' '; } + $rel .= 'noreferrer noopener'; } } - if ( $this->mOptions->getExternalLinkTarget() ) { - $attribs['target'] = $this->mOptions->getExternalLinkTarget(); - } + $attribs['rel'] = $rel; return $attribs; } - /** - * Replace unusual URL escape codes with their equivalent characters + * Replace unusual escape codes in a URL with their equivalent characters * - * @param $url String - * @return String + * This generally follows the syntax defined in RFC 3986, with special + * consideration for HTTP query strings. * - * @todo This can merge genuinely required bits in the path or query string, - * breaking legit URLs. A proper fix would treat the various parts of - * the URL differently; as a workaround, just use the output for - * statistical records, not for actual linking/output. + * @param string $url + * @return string */ - static function replaceUnusualEscapes( $url ) { - return preg_replace_callback( '/%[0-9A-Fa-f]{2}/', - array( __CLASS__, 'replaceUnusualEscapesCallback' ), $url ); - } + public static function normalizeLinkUrl( $url ) { + # First, make sure unsafe characters are encoded + $url = preg_replace_callback( '/[\x00-\x20"<>\[\\\\\]^`{|}\x7F-\xFF]/', + function ( $m ) { + return rawurlencode( $m[0] ); + }, + $url + ); - /** - * Callback function used in replaceUnusualEscapes(). - * Replaces unusual URL escape codes with their equivalent character - */ - private static function replaceUnusualEscapesCallback( $matches ) { - $char = urldecode( $matches[0] ); - $ord = ord( $char ); - # Is it an unsafe or HTTP reserved character according to RFC 1738? - if ( $ord > 32 && $ord < 127 && strpos( '<>"#{}|\^~[]`;/?', $char ) === false ) { - # No, shouldn't be escaped - return $char; - } else { - # Yes, leave it escaped - return $matches[0]; + $ret = ''; + $end = strlen( $url ); + + # Fragment part - 'fragment' + $start = strpos( $url, '#' ); + if ( $start !== false && $start < $end ) { + $ret = self::normalizeUrlComponent( + substr( $url, $start, $end - $start ), '"#%<>[\]^`{|}' ) . $ret; + $end = $start; } + + # Query part - 'query' minus &=+; + $start = strpos( $url, '?' ); + if ( $start !== false && $start < $end ) { + $ret = self::normalizeUrlComponent( + substr( $url, $start, $end - $start ), '"#%<>[\]^`{|}&=+;' ) . $ret; + $end = $start; + } + + # Scheme and path part - 'pchar' + # (we assume no userinfo or encoded colons in the host) + $ret = self::normalizeUrlComponent( + substr( $url, 0, $end ), '"#%<>[\]^`{|}/?' ) . $ret; + + return $ret; + } + + private static function normalizeUrlComponent( $component, $unsafe ) { + $callback = function ( $matches ) use ( $unsafe ) { + $char = urldecode( $matches[0] ); + $ord = ord( $char ); + if ( $ord > 32 && $ord < 127 && strpos( $unsafe, $char ) === false ) { + # Unescape it + return $char; + } else { + # Leave it escaped, but use uppercase for a-f + return strtoupper( $matches[0] ); + } + }; + return preg_replace_callback( '/%[0-9A-Fa-f]{2}/', $callback, $component ); } /** * make an image if it's allowed, either through the global * option, through the exception, or through the on-wiki whitelist - * @private + * + * @param string $url + * + * @return string */ - function maybeMakeExternalImage( $url ) { - $sk = $this->mOptions->getSkin( $this->mTitle ); + private function maybeMakeExternalImage( $url ) { $imagesfrom = $this->mOptions->getAllowExternalImagesFrom(); $imagesexception = !empty( $imagesfrom ); $text = false; @@ -1531,16 +2028,23 @@ class Parser { } else { $imagematch = false; } + if ( $this->mOptions->getAllowExternalImages() - || ( $imagesexception && $imagematch ) ) { + || ( $imagesexception && $imagematch ) + ) { if ( preg_match( self::EXT_IMAGE_REGEX, $url ) ) { # Image found - $text = $sk->makeExternalImage( $url ); + $text = Linker::makeExternalImage( $url ); } } if ( !$text && $this->mOptions->getEnableImageWhitelist() - && preg_match( self::EXT_IMAGE_REGEX, $url ) ) { - $whitelist = explode( "\n", wfMsgForContent( 'external_image_whitelist' ) ); + && preg_match( self::EXT_IMAGE_REGEX, $url ) + ) { + $whitelist = explode( + "\n", + wfMessage( 'external_image_whitelist' )->inContentLanguage()->text() + ); + foreach ( $whitelist as $entry ) { # Sanitize the regex fragment, make it case-insensitive, ignore blank entries/comments if ( strpos( $entry, '#' ) === 0 || $entry === '' ) { @@ -1548,7 +2052,7 @@ class Parser { } if ( preg_match( '/' . str_replace( '/', '\\/', $entry ) . '/i', $url ) ) { # Image matches a whitelist entry - $text = $sk->makeExternalImage( $url ); + $text = Linker::makeExternalImage( $url ); break; } } @@ -1558,28 +2062,30 @@ class Parser { /** * Process [[ ]] wikilinks - * @return String: processed text + * + * @param string $s + * + * @return string Processed text * * @private */ - function replaceInternalLinks( $s ) { + public function replaceInternalLinks( $s ) { $this->mLinkHolders->merge( $this->replaceInternalLinks2( $s ) ); return $s; } /** * Process [[ ]] wikilinks (RIL) + * @param string &$s + * @throws MWException * @return LinkHolderArray * * @private */ - function replaceInternalLinks2( &$s ) { - global $wgContLang; + public function replaceInternalLinks2( &$s ) { + global $wgExtraInterlanguageLinkPrefixes; - wfProfileIn( __METHOD__ ); - - wfProfileIn( __METHOD__.'-setup' ); - static $tc = FALSE, $e1, $e1_img; + static $tc = false, $e1, $e1_img; # the % is needed to support urlencoded titles as well if ( !$tc ) { $tc = Title::legalChars() . '#%'; @@ -1589,10 +2095,9 @@ class Parser { $e1_img = "/^([{$tc}]+)\\|(.*)\$/sD"; } - $sk = $this->mOptions->getSkin( $this->mTitle ); $holders = new LinkHolderArray( $this ); - # split the entire text string on occurences of [[ + # split the entire text string on occurrences of [[ $a = StringUtils::explode( '[[', ' ' . $s ); # get the first element (all text up to first [[), and remove the space we added $s = $a->current(); @@ -1600,23 +2105,23 @@ class Parser { $line = $a->current(); # Workaround for broken ArrayIterator::next() that returns "void" $s = substr( $s, 1 ); - $useLinkPrefixExtension = $wgContLang->linkPrefixExtension(); + $useLinkPrefixExtension = $this->getTargetLanguage()->linkPrefixExtension(); $e2 = null; if ( $useLinkPrefixExtension ) { # Match the end of a line for a word that's not followed by whitespace, # e.g. in the case of 'The Arab al[[Razi]]', 'al' will be matched - $e2 = wfMsgForContent( 'linkprefix' ); + global $wgContLang; + $charset = $wgContLang->linkPrefixCharset(); + $e2 = "/^((?>.*[^$charset]|))(.+)$/sDu"; } if ( is_null( $this->mTitle ) ) { - wfProfileOut( __METHOD__.'-setup' ); - wfProfileOut( __METHOD__ ); - throw new MWException( __METHOD__.": \$this->mTitle is null\n" ); + throw new MWException( __METHOD__ . ": \$this->mTitle is null\n" ); } $nottalk = !$this->mTitle->isTalkPage(); if ( $useLinkPrefixExtension ) { - $m = array(); + $m = []; if ( preg_match( $e2, $s, $m ) ) { $first_prefix = $m[2]; } else { @@ -1626,16 +2131,13 @@ class Parser { $prefix = ''; } - if ( $wgContLang->hasVariants() ) { - $selflink = $wgContLang->autoConvertToAllVariants( $this->mTitle->getPrefixedText() ); - } else { - $selflink = array( $this->mTitle->getPrefixedText() ); - } $useSubpages = $this->areSubpagesAllowed(); - wfProfileOut( __METHOD__.'-setup' ); + // @codingStandardsIgnoreStart Squiz.WhiteSpace.SemicolonSpacing.Incorrect # Loop for each link - for ( ; $line !== false && $line !== null ; $a->next(), $line = $a->current() ) { + for ( ; $line !== false && $line !== null; $a->next(), $line = $a->current() ) { + // @codingStandardsIgnoreEnd + # Check for excessive memory usage if ( $holders->isBig() ) { # Too big @@ -1645,100 +2147,85 @@ class Parser { } if ( $useLinkPrefixExtension ) { - wfProfileIn( __METHOD__.'-prefixhandling' ); if ( preg_match( $e2, $s, $m ) ) { $prefix = $m[2]; $s = $m[1]; } else { - $prefix=''; + $prefix = ''; } # first link if ( $first_prefix ) { $prefix = $first_prefix; $first_prefix = false; } - wfProfileOut( __METHOD__.'-prefixhandling' ); } $might_be_img = false; - wfProfileIn( __METHOD__."-e1" ); if ( preg_match( $e1, $line, $m ) ) { # page with normal text or alt $text = $m[2]; # If we get a ] at the beginning of $m[3] that means we have a link that's something like: # [[Image:Foo.jpg|[http://example.com desc]]] <- having three ] in a row fucks up, # the real problem is with the $e1 regex - # See bug 1300. - # + # See T1500. # Still some problems for cases where the ] is meant to be outside punctuation, - # and no image is in sight. See bug 2095. - # - if ( $text !== '' && - substr( $m[3], 0, 1 ) === ']' && - strpos( $text, '[' ) !== false - ) - { + # and no image is in sight. See T4095. + if ( $text !== '' + && substr( $m[3], 0, 1 ) === ']' + && strpos( $text, '[' ) !== false + ) { $text .= ']'; # so that replaceExternalLinks($text) works later $m[3] = substr( $m[3], 1 ); } # fix up urlencoded title texts if ( strpos( $m[1], '%' ) !== false ) { # Should anchors '#' also be rejected? - $m[1] = str_replace( array('<', '>'), array('<', '>'), urldecode( $m[1] ) ); + $m[1] = str_replace( [ '<', '>' ], [ '<', '>' ], rawurldecode( $m[1] ) ); } $trail = $m[3]; - } elseif ( preg_match( $e1_img, $line, $m ) ) { # Invalid, but might be an image with a link in its caption + } elseif ( preg_match( $e1_img, $line, $m ) ) { + # Invalid, but might be an image with a link in its caption $might_be_img = true; $text = $m[2]; if ( strpos( $m[1], '%' ) !== false ) { - $m[1] = urldecode( $m[1] ); + $m[1] = str_replace( [ '<', '>' ], [ '<', '>' ], rawurldecode( $m[1] ) ); } $trail = ""; } else { # Invalid form; output directly - $s .= $prefix . '[[' . $line ; - wfProfileOut( __METHOD__."-e1" ); + $s .= $prefix . '[[' . $line; continue; } - wfProfileOut( __METHOD__."-e1" ); - wfProfileIn( __METHOD__."-misc" ); + + $origLink = ltrim( $m[1], ' ' ); # Don't allow internal links to pages containing # PROTO: where PROTO is a valid URL protocol; these # should be external links. - if ( preg_match( '/^\b(?:' . wfUrlProtocols() . ')/', $m[1] ) ) { - $s .= $prefix . '[[' . $line ; - wfProfileOut( __METHOD__."-misc" ); + if ( preg_match( '/^(?i:' . $this->mUrlProtocols . ')/', $origLink ) ) { + $s .= $prefix . '[[' . $line; continue; } # Make subpage if necessary if ( $useSubpages ) { - $link = $this->maybeDoSubpageLink( $m[1], $text ); + $link = $this->maybeDoSubpageLink( $origLink, $text ); } else { - $link = $m[1]; - } - - $noforce = ( substr( $m[1], 0, 1 ) !== ':' ); - if ( !$noforce ) { - # Strip off leading ':' - $link = substr( $link, 1 ); + $link = $origLink; } - wfProfileOut( __METHOD__."-misc" ); - wfProfileIn( __METHOD__."-title" ); - $nt = Title::newFromText( $this->mStripState->unstripNoWiki( $link ) ); + $unstrip = $this->mStripState->unstripNoWiki( $link ); + $nt = is_string( $unstrip ) ? Title::newFromText( $unstrip ) : null; if ( $nt === null ) { $s .= $prefix . '[[' . $line; - wfProfileOut( __METHOD__."-title" ); continue; } $ns = $nt->getNamespace(); - $iw = $nt->getInterWiki(); - wfProfileOut( __METHOD__."-title" ); + $iw = $nt->getInterwiki(); + + $noforce = ( substr( $origLink, 0, 1 ) !== ':' ); if ( $might_be_img ) { # if this is actually an invalid link - wfProfileIn( __METHOD__."-might_be_img" ); if ( $ns == NS_FILE && $noforce ) { # but might be an image $found = false; while ( true ) { @@ -1770,44 +2257,51 @@ class Parser { $holders->merge( $this->replaceInternalLinks2( $text ) ); $s .= "{$prefix}[[$link|$text"; # note: no $trail, because without an end, there *is* no trail - wfProfileOut( __METHOD__."-might_be_img" ); continue; } } else { # it's not an image, so output it raw $s .= "{$prefix}[[$link|$text"; # note: no $trail, because without an end, there *is* no trail - wfProfileOut( __METHOD__."-might_be_img" ); continue; } - wfProfileOut( __METHOD__."-might_be_img" ); } - $wasblank = ( $text == '' ); + $wasblank = ( $text == '' ); if ( $wasblank ) { $text = $link; + if ( !$noforce ) { + # Strip off leading ':' + $text = substr( $text, 1 ); + } } else { - # Bug 4598 madness. Handle the quotes only if they come from the alternate part - # [[Lista d''e paise d''o munno]] -> Lista d''e paise d''o munno - # [[Criticism of Harry Potter|Criticism of ''Harry Potter'']] -> Criticism of Harry Potter - $text = $this->doQuotes($text); + # T6598 madness. Handle the quotes only if they come from the alternate part + # [[Lista d''e paise d''o munno]] -> Lista d''e paise d''o munno + # [[Criticism of Harry Potter|Criticism of ''Harry Potter'']] + # -> Criticism of Harry Potter + $text = $this->doQuotes( $text ); } # Link not escaped by : , create the various objects - if ( $noforce ) { - + if ( $noforce && !$nt->wasLocalInterwiki() ) { # Interwikis - wfProfileIn( __METHOD__."-interwiki" ); - if ( $iw && $this->mOptions->getInterwikiMagic() && $nottalk && $wgContLang->getLanguageName( $iw ) ) { - $this->mOutput->addLanguageLink( $nt->getFullText() ); + if ( + $iw && $this->mOptions->getInterwikiMagic() && $nottalk && ( + Language::fetchLanguageName( $iw, null, 'mw' ) || + in_array( $iw, $wgExtraInterlanguageLinkPrefixes ) + ) + ) { + # T26502: filter duplicates + if ( !isset( $this->mLangLinkLanguages[$iw] ) ) { + $this->mLangLinkLanguages[$iw] = true; + $this->mOutput->addLanguageLink( $nt->getFullText() ); + } + $s = rtrim( $s . $prefix ); - $s .= trim( $trail, "\n" ) == '' ? '': $prefix . $trail; - wfProfileOut( __METHOD__."-interwiki" ); + $s .= trim( $trail, "\n" ) == '' ? '' : $prefix . $trail; continue; } - wfProfileOut( __METHOD__."-interwiki" ); if ( $ns == NS_FILE ) { - wfProfileIn( __METHOD__."-image" ); if ( !wfIsBadImage( $nt->getDBkey(), $this->mTitle ) ) { if ( $wasblank ) { # if no parameters were passed, $text @@ -1823,19 +2317,12 @@ class Parser { $holders->merge( $this->replaceInternalLinks2( $text ) ); } # cloak any absolute URLs inside the image markup, so replaceExternalLinks() won't touch them - $s .= $prefix . $this->armorLinks( $this->makeImage( $nt, $text, $holders ) ) . $trail; - } else { - $s .= $prefix . $trail; + $s .= $prefix . $this->armorLinks( + $this->makeImage( $nt, $text, $holders ) ) . $trail; + continue; } - $this->mOutput->addImage( $nt->getDBkey() ); - wfProfileOut( __METHOD__."-image" ); - continue; - - } - - if ( $ns == NS_CATEGORY ) { - wfProfileIn( __METHOD__."-category" ); - $s = rtrim( $s . "\n" ); # bug 87 + } elseif ( $ns == NS_CATEGORY ) { + $s = rtrim( $s . "\n" ); # T2087 if ( $wasblank ) { $sortkey = $this->getDefaultSort(); @@ -1844,78 +2331,57 @@ class Parser { } $sortkey = Sanitizer::decodeCharReferences( $sortkey ); $sortkey = str_replace( "\n", '', $sortkey ); - $sortkey = $wgContLang->convertCategoryKey( $sortkey ); + $sortkey = $this->getConverterLanguage()->convertCategoryKey( $sortkey ); $this->mOutput->addCategory( $nt->getDBkey(), $sortkey ); /** - * Strip the whitespace Category links produce, see bug 87 - * @todo We might want to use trim($tmp, "\n") here. + * Strip the whitespace Category links produce, see T2087 */ - $s .= trim( $prefix . $trail, "\n" ) == '' ? '': $prefix . $trail; + $s .= trim( $prefix . $trail, "\n" ) == '' ? '' : $prefix . $trail; - wfProfileOut( __METHOD__."-category" ); continue; } } - # Self-link checking - if ( $nt->getFragment() === '' && $ns != NS_SPECIAL ) { - if ( in_array( $nt->getPrefixedText(), $selflink, true ) ) { - $s .= $prefix . $sk->makeSelfLinkObj( $nt, $text, '', $trail ); - continue; - } + # Self-link checking. For some languages, variants of the title are checked in + # LinkHolderArray::doVariants() to allow batching the existence checks necessary + # for linking to a different variant. + if ( $ns != NS_SPECIAL && $nt->equals( $this->mTitle ) && !$nt->hasFragment() ) { + $s .= $prefix . Linker::makeSelfLinkObj( $nt, $text, '', $trail ); + continue; } # NS_MEDIA is a pseudo-namespace for linking directly to a file - # FIXME: Should do batch file existence checks, see comment below + # @todo FIXME: Should do batch file existence checks, see comment below if ( $ns == NS_MEDIA ) { - wfProfileIn( __METHOD__."-media" ); # Give extensions a chance to select the file revision for us - $skip = $time = false; - wfRunHooks( 'BeforeParserMakeImageLinkObj', array( &$this, &$nt, &$skip, &$time ) ); - if ( $skip ) { - $link = $sk->link( $nt ); - } else { - $link = $sk->makeMediaLinkObj( $nt, $text, $time ); - } + $options = []; + $descQuery = false; + Hooks::run( 'BeforeParserFetchFileAndTitle', + [ $this, $nt, &$options, &$descQuery ] ); + # Fetch and register the file (file title may be different via hooks) + list( $file, $nt ) = $this->fetchFileAndTitle( $nt, $options ); # Cloak with NOPARSE to avoid replacement in replaceExternalLinks - $s .= $prefix . $this->armorLinks( $link ) . $trail; - $this->mOutput->addImage( $nt->getDBkey() ); - wfProfileOut( __METHOD__."-media" ); + $s .= $prefix . $this->armorLinks( + Linker::makeMediaLinkFile( $nt, $file, $text ) ) . $trail; continue; } - wfProfileIn( __METHOD__."-always_known" ); # Some titles, such as valid special pages or files in foreign repos, should # be shown as bluelinks even though they're not included in the page table - # - # FIXME: isAlwaysKnown() can be expensive for file links; we should really do + # @todo FIXME: isAlwaysKnown() can be expensive for file links; we should really do # batch file existence checks for NS_FILE and NS_MEDIA if ( $iw == '' && $nt->isAlwaysKnown() ) { $this->mOutput->addLink( $nt ); - $s .= $this->makeKnownLinkHolder( $nt, $text, '', $trail, $prefix ); + $s .= $this->makeKnownLinkHolder( $nt, $text, $trail, $prefix ); } else { # Links will be added to the output link list after checking - $s .= $holders->makeHolder( $nt, $text, '', $trail, $prefix ); + $s .= $holders->makeHolder( $nt, $text, [], $trail, $prefix ); } - wfProfileOut( __METHOD__."-always_known" ); } - wfProfileOut( __METHOD__ ); return $holders; } - /** - * Make a link placeholder. The text returned can be later resolved to a real link with - * replaceLinkHolders(). This is done for two reasons: firstly to avoid further - * parsing of interwiki links, and secondly to allow all existence checks and - * article length checks (for stub links) to be bundled into a single query. - * - * @deprecated - */ - function makeLinkHolder( &$nt, $text = '', $query = '', $trail = '', $prefix = '' ) { - return $this->mLinkHolders->makeHolder( $nt, $text, $query, $trail, $prefix ); - } - /** * Render a forced-blue link inline; protect against double expansion of * URLs if we're in a mode that prepends full URL prefixes to internal links. @@ -1923,18 +2389,23 @@ class Parser { * breaking URLs in the following text without breaking trails on the * wiki links, it's been made into a horrible function. * - * @param $nt Title - * @param $text String - * @param $query String - * @param $trail String - * @param $prefix String - * @return String: HTML-wikitext mix oh yuck + * @param Title $nt + * @param string $text + * @param string $trail + * @param string $prefix + * @return string HTML-wikitext mix oh yuck */ - function makeKnownLinkHolder( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) { + protected function makeKnownLinkHolder( $nt, $text = '', $trail = '', $prefix = '' ) { list( $inside, $trail ) = Linker::splitTrail( $trail ); - $sk = $this->mOptions->getSkin( $this->mTitle ); - # FIXME: use link() instead of deprecated makeKnownLinkObj() - $link = $sk->makeKnownLinkObj( $nt, $text, $query, $inside, $prefix ); + + if ( $text == '' ) { + $text = htmlspecialchars( $nt->getPrefixedText() ); + } + + $link = $this->getLinkRenderer()->makeKnownLink( + $nt, new HtmlArmor( "$prefix$text$inside" ) + ); + return $this->armorLinks( $link ) . $trail; } @@ -1945,604 +2416,175 @@ class Parser { * Not needed quite as much as it used to be since free links are a bit * more sensible these days. But bracketed links are still an issue. * - * @param $text String: more-or-less HTML - * @return String: less-or-more HTML with NOPARSE bits - */ - function armorLinks( $text ) { - return preg_replace( '/\b(' . wfUrlProtocols() . ')/', - "{$this->mUniqPrefix}NOPARSE$1", $text ); - } - - /** - * Return true if subpage links should be expanded on this page. - * @return Boolean - */ - function areSubpagesAllowed() { - # Some namespaces don't allow subpages - return MWNamespace::hasSubpages( $this->mTitle->getNamespace() ); - } - - /** - * Handle link to subpage if necessary - * - * @param $target String: the source of the link - * @param &$text String: the link text, modified as necessary - * @return string the full name of the link - * @private - */ - function maybeDoSubpageLink( $target, &$text ) { - return Linker::normalizeSubpageLink( $this->mTitle, $target, $text ); - } - - /**#@+ - * Used by doBlockLevels() - * @private - */ - function closeParagraph() { - $result = ''; - if ( $this->mLastSection != '' ) { - $result = 'mLastSection . ">\n"; - } - $this->mInPre = false; - $this->mLastSection = ''; - return $result; - } - - /** - * getCommon() returns the length of the longest common substring - * of both arguments, starting at the beginning of both. - * @private - */ - function getCommon( $st1, $st2 ) { - $fl = strlen( $st1 ); - $shorter = strlen( $st2 ); - if ( $fl < $shorter ) { - $shorter = $fl; - } - - for ( $i = 0; $i < $shorter; ++$i ) { - if ( $st1{$i} != $st2{$i} ) { - break; - } - } - return $i; - } - - /** - * These next three functions open, continue, and close the list - * element appropriate to the prefix character passed into them. - * @private - */ - function openList( $char ) { - $result = $this->closeParagraph(); - - if ( '*' === $char ) { - $result .= '
  • '; - } elseif ( '#' === $char ) { - $result .= '
    1. '; - } elseif ( ':' === $char ) { - $result .= '
      '; - } elseif ( ';' === $char ) { - $result .= '
      '; - $this->mDTopen = true; - } else { - $result = ''; - } - - return $result; - } - - /** - * TODO: document - * @param $char String - * @private + * @param string $text More-or-less HTML + * @return string Less-or-more HTML with NOPARSE bits */ - function nextItem( $char ) { - if ( '*' === $char || '#' === $char ) { - return '
    2. '; - } elseif ( ':' === $char || ';' === $char ) { - $close = ''; - if ( $this->mDTopen ) { - $close = ''; - } - if ( ';' === $char ) { - $this->mDTopen = true; - return $close . '
      '; - } else { - $this->mDTopen = false; - return $close . '
      '; - } - } - return ''; - } - - /** - * TODO: document - * @param $char String - * @private - */ - function closeList( $char ) { - if ( '*' === $char ) { - $text = '
'; - } elseif ( '#' === $char ) { - $text = ''; - } elseif ( ':' === $char ) { - if ( $this->mDTopen ) { - $this->mDTopen = false; - $text = ''; - } else { - $text = ''; - } - } else { - return ''; - } - return $text."\n"; + public function armorLinks( $text ) { + return preg_replace( '/\b((?i)' . $this->mUrlProtocols . ')/', + self::MARKER_PREFIX . "NOPARSE$1", $text ); } - /**#@-*/ - - /** - * Make lists from lines starting with ':', '*', '#', etc. (DBL) - * - * @param $text String - * @param $linestart Boolean: whether or not this is at the start of a line. - * @private - * @return string the lists rendered as HTML - */ - function doBlockLevels( $text, $linestart ) { - wfProfileIn( __METHOD__ ); - - # Parsing through the text line by line. The main thing - # happening here is handling of block-level elements p, pre, - # and making lists from lines starting with * # : etc. - # - $textLines = StringUtils::explode( "\n", $text ); - - $lastPrefix = $output = ''; - $this->mDTopen = $inBlockElem = false; - $prefixLength = 0; - $paragraphStack = false; - - foreach ( $textLines as $oLine ) { - # Fix up $linestart - if ( !$linestart ) { - $output .= $oLine; - $linestart = true; - continue; - } - # * = ul - # # = ol - # ; = dt - # : = dd - - $lastPrefixLength = strlen( $lastPrefix ); - $preCloseMatch = preg_match( '/<\\/pre/i', $oLine ); - $preOpenMatch = preg_match( '/
 element, scan for and figure out what prefixes are there.
-			if ( !$this->mInPre ) {
-				# Multiple prefixes may abut each other for nested lists.
-				$prefixLength = strspn( $oLine, '*#:;' );
-				$prefix = substr( $oLine, 0, $prefixLength );
-
-				# eh?
-				# ; and : are both from definition-lists, so they're equivalent
-				#  for the purposes of determining whether or not we need to open/close
-				#  elements.
-				$prefix2 = str_replace( ';', ':', $prefix );
-				$t = substr( $oLine, $prefixLength );
-				$this->mInPre = (bool)$preOpenMatch;
-			} else {
-				# Don't interpret any other prefixes in preformatted text
-				$prefixLength = 0;
-				$prefix = $prefix2 = '';
-				$t = $oLine;
-			}
-
-			# List generation
-			if ( $prefixLength && $lastPrefix === $prefix2 ) {
-				# Same as the last item, so no need to deal with nesting or opening stuff
-				$output .= $this->nextItem( substr( $prefix, -1 ) );
-				$paragraphStack = false;
-
-				if ( substr( $prefix, -1 ) === ';') {
-					# The one nasty exception: definition lists work like this:
-					# ; title : definition text
-					# So we check for : in the remainder text to split up the
-					# title and definition, without b0rking links.
-					$term = $t2 = '';
-					if ( $this->findColonNoLinks( $t, $term, $t2 ) !== false ) {
-						$t = $t2;
-						$output .= $term . $this->nextItem( ':' );
-					}
-				}
-			} elseif ( $prefixLength || $lastPrefixLength ) {
-				# We need to open or close prefixes, or both.
-
-				# Either open or close a level...
-				$commonPrefixLength = $this->getCommon( $prefix, $lastPrefix );
-				$paragraphStack = false;
 
-				# Close all the prefixes which aren't shared.
-				while ( $commonPrefixLength < $lastPrefixLength ) {
-					$output .= $this->closeList( $lastPrefix[$lastPrefixLength-1] );
-					--$lastPrefixLength;
-				}
-
-				# Continue the current prefix if appropriate.
-				if ( $prefixLength <= $commonPrefixLength && $commonPrefixLength > 0 ) {
-					$output .= $this->nextItem( $prefix[$commonPrefixLength-1] );
-				}
-
-				# Open prefixes where appropriate.
-				while ( $prefixLength > $commonPrefixLength ) {
-					$char = substr( $prefix, $commonPrefixLength, 1 );
-					$output .= $this->openList( $char );
-
-					if ( ';' === $char ) {
-						# FIXME: This is dupe of code above
-						if ( $this->findColonNoLinks( $t, $term, $t2 ) !== false ) {
-							$t = $t2;
-							$output .= $term . $this->nextItem( ':' );
-						}
-					}
-					++$commonPrefixLength;
-				}
-				$lastPrefix = $prefix2;
-			}
-
-			# If we have no prefixes, go to paragraph mode.
-			if ( 0 == $prefixLength ) {
-				wfProfileIn( __METHOD__."-paragraph" );
-				# No prefix (not in list)--go to paragraph mode
-				# XXX: use a stack for nestable elements like span, table and div
-				$openmatch = preg_match('/(?:mUniqPrefix.'-pre|<\\/li|<\\/ul|<\\/ol|<\\/?center)/iS', $t );
-				if ( $openmatch or $closematch ) {
-					$paragraphStack = false;
-					# TODO bug 5718: paragraph closed
-					$output .= $this->closeParagraph();
-					if ( $preOpenMatch and !$preCloseMatch ) {
-						$this->mInPre = true;
-					}
-					$inBlockElem = !$closematch;
-				} elseif ( !$inBlockElem && !$this->mInPre ) {
-					if ( ' ' == substr( $t, 0, 1 ) and ( $this->mLastSection === 'pre' || trim( $t ) != '' ) ) {
-						# pre
-						if ( $this->mLastSection !== 'pre' ) {
-							$paragraphStack = false;
-							$output .= $this->closeParagraph().'
';
-							$this->mLastSection = 'pre';
-						}
-						$t = substr( $t, 1 );
-					} else {
-						# paragraph
-						if ( trim( $t ) === '' ) {
-							if ( $paragraphStack ) {
-								$output .= $paragraphStack.'
';
-								$paragraphStack = false;
-								$this->mLastSection = 'p';
-							} else {
-								if ( $this->mLastSection !== 'p' ) {
-									$output .= $this->closeParagraph();
-									$this->mLastSection = '';
-									$paragraphStack = '
';
-								} else {
-									$paragraphStack = '
';
-								}
-							}
-						} else {
-							if ( $paragraphStack ) {
-								$output .= $paragraphStack;
-								$paragraphStack = false;
-								$this->mLastSection = 'p';
-							} elseif ( $this->mLastSection !== 'p' ) {
-								$output .= $this->closeParagraph().'
';
-								$this->mLastSection = 'p';
-							}
-						}
-					}
-				}
-				wfProfileOut( __METHOD__."-paragraph" );
-			}
-			# somewhere above we forget to get out of pre block (bug 785)
-			if ( $preCloseMatch && $this->mInPre ) {
-				$this->mInPre = false;
-			}
-			if ( $paragraphStack === false ) {
-				$output .= $t."\n";
-			}
-		}
-		while ( $prefixLength ) {
-			$output .= $this->closeList( $prefix2[$prefixLength-1] );
-			--$prefixLength;
-		}
-		if ( $this->mLastSection != '' ) {
-			$output .= 'mLastSection . '>';
-			$this->mLastSection = '';
-		}
-
-		wfProfileOut( __METHOD__ );
-		return $output;
-	}
-
-	/**
-	 * Split up a string on ':', ignoring any occurences inside tags
-	 * to prevent illegal overlapping.
-	 *
-	 * @param $str String: the string to split
-	 * @param &$before String: set to everything before the ':'
-	 * @param &$after String: set to everything after the ':'
-	 * return String: the position of the ':', or false if none found
-	 */
-	function findColonNoLinks( $str, &$before, &$after ) {
-		wfProfileIn( __METHOD__ );
-
-		$pos = strpos( $str, ':' );
-		if ( $pos === false ) {
-			# Nothing to find!
-			wfProfileOut( __METHOD__ );
-			return false;
-		}
-
-		$lt = strpos( $str, '<' );
-		if ( $lt === false || $lt > $pos ) {
-			# Easy; no tag nesting to worry about
-			$before = substr( $str, 0, $pos );
-			$after = substr( $str, $pos+1 );
-			wfProfileOut( __METHOD__ );
-			return $pos;
-		}
-
-		# Ugly state machine to walk through avoiding tags.
-		$state = self::COLON_STATE_TEXT;
-		$stack = 0;
-		$len = strlen( $str );
-		for( $i = 0; $i < $len; $i++ ) {
-			$c = $str{$i};
-
-			switch( $state ) {
-			# (Using the number is a performance hack for common cases)
-			case 0: # self::COLON_STATE_TEXT:
-				switch( $c ) {
-				case "<":
-					# Could be either a  tag or an  tag
-					$state = self::COLON_STATE_TAGSTART;
-					break;
-				case ":":
-					if ( $stack == 0 ) {
-						# We found it!
-						$before = substr( $str, 0, $i );
-						$after = substr( $str, $i + 1 );
-						wfProfileOut( __METHOD__ );
-						return $i;
-					}
-					# Embedded in a tag; don't break it.
-					break;
-				default:
-					# Skip ahead looking for something interesting
-					$colon = strpos( $str, ':', $i );
-					if ( $colon === false ) {
-						# Nothing else interesting
-						wfProfileOut( __METHOD__ );
-						return false;
-					}
-					$lt = strpos( $str, '<', $i );
-					if ( $stack === 0 ) {
-						if ( $lt === false || $colon < $lt ) {
-							# We found it!
-							$before = substr( $str, 0, $colon );
-							$after = substr( $str, $colon + 1 );
-							wfProfileOut( __METHOD__ );
-							return $i;
-						}
-					}
-					if ( $lt === false ) {
-						# Nothing else interesting to find; abort!
-						# We're nested, but there's no close tags left. Abort!
-						break 2;
-					}
-					# Skip ahead to next tag start
-					$i = $lt;
-					$state = self::COLON_STATE_TAGSTART;
-				}
-				break;
-			case 1: # self::COLON_STATE_TAG:
-				# In a 
-				switch( $c ) {
-				case ">":
-					$stack++;
-					$state = self::COLON_STATE_TEXT;
-					break;
-				case "/":
-					# Slash may be followed by >?
-					$state = self::COLON_STATE_TAGSLASH;
-					break;
-				default:
-					# ignore
-				}
-				break;
-			case 2: # self::COLON_STATE_TAGSTART:
-				switch( $c ) {
-				case "/":
-					$state = self::COLON_STATE_CLOSETAG;
-					break;
-				case "!":
-					$state = self::COLON_STATE_COMMENT;
-					break;
-				case ">":
-					# Illegal early close? This shouldn't happen D:
-					$state = self::COLON_STATE_TEXT;
-					break;
-				default:
-					$state = self::COLON_STATE_TAG;
-				}
-				break;
-			case 3: # self::COLON_STATE_CLOSETAG:
-				# In a 
-				if ( $c === ">" ) {
-					$stack--;
-					if ( $stack < 0 ) {
-						wfDebug( __METHOD__.": Invalid input; too many close tags\n" );
-						wfProfileOut( __METHOD__ );
-						return false;
-					}
-					$state = self::COLON_STATE_TEXT;
-				}
-				break;
-			case self::COLON_STATE_TAGSLASH:
-				if ( $c === ">" ) {
-					# Yes, a self-closed tag 
-					$state = self::COLON_STATE_TEXT;
-				} else {
-					# Probably we're jumping the gun, and this is an attribute
-					$state = self::COLON_STATE_TAG;
-				}
-				break;
-			case 5: # self::COLON_STATE_COMMENT:
-				if ( $c === "-" ) {
-					$state = self::COLON_STATE_COMMENTDASH;
-				}
-				break;
-			case self::COLON_STATE_COMMENTDASH:
-				if ( $c === "-" ) {
-					$state = self::COLON_STATE_COMMENTDASHDASH;
-				} else {
-					$state = self::COLON_STATE_COMMENT;
-				}
-				break;
-			case self::COLON_STATE_COMMENTDASHDASH:
-				if ( $c === ">" ) {
-					$state = self::COLON_STATE_TEXT;
-				} else {
-					$state = self::COLON_STATE_COMMENT;
-				}
-				break;
-			default:
-				throw new MWException( "State machine error in " . __METHOD__ );
-			}
-		}
-		if ( $stack > 0 ) {
-			wfDebug( __METHOD__.": Invalid input; not enough close tags (stack $stack, state $state)\n" );
-			wfProfileOut( __METHOD__ );
-			return false;
-		}
-		wfProfileOut( __METHOD__ );
-		return false;
+	/**
+	 * Return true if subpage links should be expanded on this page.
+	 * @return bool
+	 */
+	public function areSubpagesAllowed() {
+		# Some namespaces don't allow subpages
+		return MWNamespace::hasSubpages( $this->mTitle->getNamespace() );
+	}
+
+	/**
+	 * Handle link to subpage if necessary
+	 *
+	 * @param string $target The source of the link
+	 * @param string &$text The link text, modified as necessary
+	 * @return string The full name of the link
+	 * @private
+	 */
+	public function maybeDoSubpageLink( $target, &$text ) {
+		return Linker::normalizeSubpageLink( $this->mTitle, $target, $text );
+	}
+
+	/**
+	 * Make lists from lines starting with ':', '*', '#', etc. (DBL)
+	 *
+	 * @param string $text
+	 * @param bool $linestart Whether or not this is at the start of a line.
+	 * @private
+	 * @return string The lists rendered as HTML
+	 */
+	public function doBlockLevels( $text, $linestart ) {
+		return BlockLevelPass::doBlockLevels( $text, $linestart );
 	}
 
 	/**
 	 * Return value of a magic variable (like PAGENAME)
 	 *
 	 * @private
+	 *
+	 * @param string $index Magic variable identifier as mapped in MagicWord::$mVariableIDs
+	 * @param bool|PPFrame $frame
+	 *
+	 * @throws MWException
+	 * @return string
 	 */
-	function getVariableValue( $index, $frame=false ) {
-		global $wgContLang, $wgSitename, $wgServer;
+	public function getVariableValue( $index, $frame = false ) {
+		global $wgContLang, $wgSitename, $wgServer, $wgServerName;
 		global $wgArticlePath, $wgScriptPath, $wgStylePath;
 
+		if ( is_null( $this->mTitle ) ) {
+			// If no title set, bad things are going to happen
+			// later. Title should always be set since this
+			// should only be called in the middle of a parse
+			// operation (but the unit-tests do funky stuff)
+			throw new MWException( __METHOD__ . ' Should only be '
+				. ' called while parsing (no title set)' );
+		}
+
+		// Avoid PHP 7.1 warning from passing $this by reference
+		$parser = $this;
+
 		/**
 		 * Some of these require message or data lookups and can be
 		 * expensive to check many times.
 		 */
-		if ( wfRunHooks( 'ParserGetVariableValueVarCache', array( &$this, &$this->mVarCache ) ) ) {
+		if ( Hooks::run( 'ParserGetVariableValueVarCache', [ &$parser, &$this->mVarCache ] ) ) {
 			if ( isset( $this->mVarCache[$index] ) ) {
 				return $this->mVarCache[$index];
 			}
 		}
 
 		$ts = wfTimestamp( TS_UNIX, $this->mOptions->getTimestamp() );
-		wfRunHooks( 'ParserGetVariableValueTs', array( &$this, &$ts ) );
-
-		# Use the time zone
-		global $wgLocaltimezone;
-		if ( isset( $wgLocaltimezone ) ) {
-			$oldtz = date_default_timezone_get();
-			date_default_timezone_set( $wgLocaltimezone );
-		}
+		Hooks::run( 'ParserGetVariableValueTs', [ &$parser, &$ts ] );
 
-		$localTimestamp = date( 'YmdHis', $ts );
-		$localMonth = date( 'm', $ts );
-		$localMonth1 = date( 'n', $ts );
-		$localMonthName = date( 'n', $ts );
-		$localDay = date( 'j', $ts );
-		$localDay2 = date( 'd', $ts );
-		$localDayOfWeek = date( 'w', $ts );
-		$localWeek = date( 'W', $ts );
-		$localYear = date( 'Y', $ts );
-		$localHour = date( 'H', $ts );
-		if ( isset( $wgLocaltimezone ) ) {
-			date_default_timezone_set( $oldtz );
-		}
+		$pageLang = $this->getFunctionLang();
 
 		switch ( $index ) {
+			case '!':
+				$value = '|';
+				break;
 			case 'currentmonth':
-				$value = $wgContLang->formatNum( gmdate( 'm', $ts ) );
+				$value = $pageLang->formatNum( MWTimestamp::getInstance( $ts )->format( 'm' ) );
 				break;
 			case 'currentmonth1':
-				$value = $wgContLang->formatNum( gmdate( 'n', $ts ) );
+				$value = $pageLang->formatNum( MWTimestamp::getInstance( $ts )->format( 'n' ) );
 				break;
 			case 'currentmonthname':
-				$value = $wgContLang->getMonthName( gmdate( 'n', $ts ) );
+				$value = $pageLang->getMonthName( MWTimestamp::getInstance( $ts )->format( 'n' ) );
 				break;
 			case 'currentmonthnamegen':
-				$value = $wgContLang->getMonthNameGen( gmdate( 'n', $ts ) );
+				$value = $pageLang->getMonthNameGen( MWTimestamp::getInstance( $ts )->format( 'n' ) );
 				break;
 			case 'currentmonthabbrev':
-				$value = $wgContLang->getMonthAbbreviation( gmdate( 'n', $ts ) );
+				$value = $pageLang->getMonthAbbreviation( MWTimestamp::getInstance( $ts )->format( 'n' ) );
 				break;
 			case 'currentday':
-				$value = $wgContLang->formatNum( gmdate( 'j', $ts ) );
+				$value = $pageLang->formatNum( MWTimestamp::getInstance( $ts )->format( 'j' ) );
 				break;
 			case 'currentday2':
-				$value = $wgContLang->formatNum( gmdate( 'd', $ts ) );
+				$value = $pageLang->formatNum( MWTimestamp::getInstance( $ts )->format( 'd' ) );
 				break;
 			case 'localmonth':
-				$value = $wgContLang->formatNum( $localMonth );
+				$value = $pageLang->formatNum( MWTimestamp::getLocalInstance( $ts )->format( 'm' ) );
 				break;
 			case 'localmonth1':
-				$value = $wgContLang->formatNum( $localMonth1 );
+				$value = $pageLang->formatNum( MWTimestamp::getLocalInstance( $ts )->format( 'n' ) );
 				break;
 			case 'localmonthname':
-				$value = $wgContLang->getMonthName( $localMonthName );
+				$value = $pageLang->getMonthName( MWTimestamp::getLocalInstance( $ts )->format( 'n' ) );
 				break;
 			case 'localmonthnamegen':
-				$value = $wgContLang->getMonthNameGen( $localMonthName );
+				$value = $pageLang->getMonthNameGen( MWTimestamp::getLocalInstance( $ts )->format( 'n' ) );
 				break;
 			case 'localmonthabbrev':
-				$value = $wgContLang->getMonthAbbreviation( $localMonthName );
+				$value = $pageLang->getMonthAbbreviation( MWTimestamp::getLocalInstance( $ts )->format( 'n' ) );
 				break;
 			case 'localday':
-				$value = $wgContLang->formatNum( $localDay );
+				$value = $pageLang->formatNum( MWTimestamp::getLocalInstance( $ts )->format( 'j' ) );
 				break;
 			case 'localday2':
-				$value = $wgContLang->formatNum( $localDay2 );
+				$value = $pageLang->formatNum( MWTimestamp::getLocalInstance( $ts )->format( 'd' ) );
 				break;
 			case 'pagename':
 				$value = wfEscapeWikiText( $this->mTitle->getText() );
 				break;
 			case 'pagenamee':
-				$value = $this->mTitle->getPartialURL();
+				$value = wfEscapeWikiText( $this->mTitle->getPartialURL() );
 				break;
 			case 'fullpagename':
 				$value = wfEscapeWikiText( $this->mTitle->getPrefixedText() );
 				break;
 			case 'fullpagenamee':
-				$value = $this->mTitle->getPrefixedURL();
+				$value = wfEscapeWikiText( $this->mTitle->getPrefixedURL() );
 				break;
 			case 'subpagename':
 				$value = wfEscapeWikiText( $this->mTitle->getSubpageText() );
 				break;
 			case 'subpagenamee':
-				$value = $this->mTitle->getSubpageUrlForm();
+				$value = wfEscapeWikiText( $this->mTitle->getSubpageUrlForm() );
+				break;
+			case 'rootpagename':
+				$value = wfEscapeWikiText( $this->mTitle->getRootText() );
+				break;
+			case 'rootpagenamee':
+				$value = wfEscapeWikiText( wfUrlencode( str_replace(
+					' ',
+					'_',
+					$this->mTitle->getRootText()
+				) ) );
 				break;
 			case 'basepagename':
 				$value = wfEscapeWikiText( $this->mTitle->getBaseText() );
 				break;
 			case 'basepagenamee':
-				$value = wfUrlEncode( str_replace( ' ', '_', $this->mTitle->getBaseText() ) );
+				$value = wfEscapeWikiText( wfUrlencode( str_replace(
+					' ',
+					'_',
+					$this->mTitle->getBaseText()
+				) ) );
 				break;
 			case 'talkpagename':
-				if ( $this->mTitle->canTalk() ) {
+				if ( $this->mTitle->canHaveTalkPage() ) {
 					$talkPage = $this->mTitle->getTalkPage();
 					$value = wfEscapeWikiText( $talkPage->getPrefixedText() );
 				} else {
@@ -2550,9 +2592,9 @@ class Parser {
 				}
 				break;
 			case 'talkpagenamee':
-				if ( $this->mTitle->canTalk() ) {
+				if ( $this->mTitle->canHaveTalkPage() ) {
 					$talkPage = $this->mTitle->getTalkPage();
-					$value = $talkPage->getPrefixedUrl();
+					$value = wfEscapeWikiText( $talkPage->getPrefixedURL() );
 				} else {
 					$value = '';
 				}
@@ -2563,14 +2605,30 @@ class Parser {
 				break;
 			case 'subjectpagenamee':
 				$subjPage = $this->mTitle->getSubjectPage();
-				$value = $subjPage->getPrefixedUrl();
+				$value = wfEscapeWikiText( $subjPage->getPrefixedURL() );
+				break;
+			case 'pageid': // requested in T25427
+				$pageid = $this->getTitle()->getArticleID();
+				if ( $pageid == 0 ) {
+					# 0 means the page doesn't exist in the database,
+					# which means the user is previewing a new page.
+					# The vary-revision flag must be set, because the magic word
+					# will have a different value once the page is saved.
+					$this->mOutput->setFlag( 'vary-revision' );
+					wfDebug( __METHOD__ . ": {{PAGEID}} used in a new page, setting vary-revision...\n" );
+				}
+				$value = $pageid ? $pageid : null;
 				break;
 			case 'revisionid':
 				# Let the edit saving system know we should parse the page
 				# *after* a revision ID has been assigned.
-				$this->mOutput->setFlag( 'vary-revision' );
-				wfDebug( __METHOD__ . ": {{REVISIONID}} used, setting vary-revision...\n" );
+				$this->mOutput->setFlag( 'vary-revision-id' );
+				wfDebug( __METHOD__ . ": {{REVISIONID}} used, setting vary-revision-id...\n" );
 				$value = $this->mRevisionId;
+				if ( !$value && $this->mOptions->getSpeculativeRevIdCallback() ) {
+					$value = call_user_func( $this->mOptions->getSpeculativeRevIdCallback() );
+					$this->mOutput->setSpeculativeRevIdUsed( $value );
+				}
 				break;
 			case 'revisionday':
 				# Let the edit saving system know we should parse the page
@@ -2616,98 +2674,109 @@ class Parser {
 				break;
 			case 'revisionuser':
 				# Let the edit saving system know we should parse the page
-				# *after* a revision ID has been assigned. This is for null edits.
-				$this->mOutput->setFlag( 'vary-revision' );
-				wfDebug( __METHOD__ . ": {{REVISIONUSER}} used, setting vary-revision...\n" );
+				# *after* a revision ID has been assigned for null edits.
+				$this->mOutput->setFlag( 'vary-user' );
+				wfDebug( __METHOD__ . ": {{REVISIONUSER}} used, setting vary-user...\n" );
 				$value = $this->getRevisionUser();
 				break;
+			case 'revisionsize':
+				$value = $this->getRevisionSize();
+				break;
 			case 'namespace':
-				$value = str_replace( '_',' ',$wgContLang->getNsText( $this->mTitle->getNamespace() ) );
+				$value = str_replace( '_', ' ', $wgContLang->getNsText( $this->mTitle->getNamespace() ) );
 				break;
 			case 'namespacee':
 				$value = wfUrlencode( $wgContLang->getNsText( $this->mTitle->getNamespace() ) );
 				break;
+			case 'namespacenumber':
+				$value = $this->mTitle->getNamespace();
+				break;
 			case 'talkspace':
-				$value = $this->mTitle->canTalk() ? str_replace( '_',' ',$this->mTitle->getTalkNsText() ) : '';
+				$value = $this->mTitle->canHaveTalkPage()
+					? str_replace( '_', ' ', $this->mTitle->getTalkNsText() )
+					: '';
 				break;
 			case 'talkspacee':
-				$value = $this->mTitle->canTalk() ? wfUrlencode( $this->mTitle->getTalkNsText() ) : '';
+				$value = $this->mTitle->canHaveTalkPage() ? wfUrlencode( $this->mTitle->getTalkNsText() ) : '';
 				break;
 			case 'subjectspace':
-				$value = $this->mTitle->getSubjectNsText();
+				$value = str_replace( '_', ' ', $this->mTitle->getSubjectNsText() );
 				break;
 			case 'subjectspacee':
 				$value = ( wfUrlencode( $this->mTitle->getSubjectNsText() ) );
 				break;
 			case 'currentdayname':
-				$value = $wgContLang->getWeekdayName( gmdate( 'w', $ts ) + 1 );
+				$value = $pageLang->getWeekdayName( (int)MWTimestamp::getInstance( $ts )->format( 'w' ) + 1 );
 				break;
 			case 'currentyear':
-				$value = $wgContLang->formatNum( gmdate( 'Y', $ts ), true );
+				$value = $pageLang->formatNum( MWTimestamp::getInstance( $ts )->format( 'Y' ), true );
 				break;
 			case 'currenttime':
-				$value = $wgContLang->time( wfTimestamp( TS_MW, $ts ), false, false );
+				$value = $pageLang->time( wfTimestamp( TS_MW, $ts ), false, false );
 				break;
 			case 'currenthour':
-				$value = $wgContLang->formatNum( gmdate( 'H', $ts ), true );
+				$value = $pageLang->formatNum( MWTimestamp::getInstance( $ts )->format( 'H' ), true );
 				break;
 			case 'currentweek':
-				# @bug 4594 PHP5 has it zero padded, PHP4 does not, cast to
+				# @bug T6594 PHP5 has it zero padded, PHP4 does not, cast to
 				# int to remove the padding
-				$value = $wgContLang->formatNum( (int)gmdate( 'W', $ts ) );
+				$value = $pageLang->formatNum( (int)MWTimestamp::getInstance( $ts )->format( 'W' ) );
 				break;
 			case 'currentdow':
-				$value = $wgContLang->formatNum( gmdate( 'w', $ts ) );
+				$value = $pageLang->formatNum( MWTimestamp::getInstance( $ts )->format( 'w' ) );
 				break;
 			case 'localdayname':
-				$value = $wgContLang->getWeekdayName( $localDayOfWeek + 1 );
+				$value = $pageLang->getWeekdayName(
+					(int)MWTimestamp::getLocalInstance( $ts )->format( 'w' ) + 1
+				);
 				break;
 			case 'localyear':
-				$value = $wgContLang->formatNum( $localYear, true );
+				$value = $pageLang->formatNum( MWTimestamp::getLocalInstance( $ts )->format( 'Y' ), true );
 				break;
 			case 'localtime':
-				$value = $wgContLang->time( $localTimestamp, false, false );
+				$value = $pageLang->time(
+					MWTimestamp::getLocalInstance( $ts )->format( 'YmdHis' ),
+					false,
+					false
+				);
 				break;
 			case 'localhour':
-				$value = $wgContLang->formatNum( $localHour, true );
+				$value = $pageLang->formatNum( MWTimestamp::getLocalInstance( $ts )->format( 'H' ), true );
 				break;
 			case 'localweek':
-				# @bug 4594 PHP5 has it zero padded, PHP4 does not, cast to
+				# @bug T6594 PHP5 has it zero padded, PHP4 does not, cast to
 				# int to remove the padding
-				$value = $wgContLang->formatNum( (int)$localWeek );
+				$value = $pageLang->formatNum( (int)MWTimestamp::getLocalInstance( $ts )->format( 'W' ) );
 				break;
 			case 'localdow':
-				$value = $wgContLang->formatNum( $localDayOfWeek );
+				$value = $pageLang->formatNum( MWTimestamp::getLocalInstance( $ts )->format( 'w' ) );
 				break;
 			case 'numberofarticles':
-				$value = $wgContLang->formatNum( SiteStats::articles() );
+				$value = $pageLang->formatNum( SiteStats::articles() );
 				break;
 			case 'numberoffiles':
-				$value = $wgContLang->formatNum( SiteStats::images() );
+				$value = $pageLang->formatNum( SiteStats::images() );
 				break;
 			case 'numberofusers':
-				$value = $wgContLang->formatNum( SiteStats::users() );
+				$value = $pageLang->formatNum( SiteStats::users() );
 				break;
 			case 'numberofactiveusers':
-				$value = $wgContLang->formatNum( SiteStats::activeUsers() );
+				$value = $pageLang->formatNum( SiteStats::activeUsers() );
 				break;
 			case 'numberofpages':
-				$value = $wgContLang->formatNum( SiteStats::pages() );
+				$value = $pageLang->formatNum( SiteStats::pages() );
 				break;
 			case 'numberofadmins':
-				$value = $wgContLang->formatNum( SiteStats::numberingroup( 'sysop' ) );
+				$value = $pageLang->formatNum( SiteStats::numberingroup( 'sysop' ) );
 				break;
 			case 'numberofedits':
-				$value = $wgContLang->formatNum( SiteStats::edits() );
-				break;
-			case 'numberofviews':
-				$value = $wgContLang->formatNum( SiteStats::views() );
+				$value = $pageLang->formatNum( SiteStats::edits() );
 				break;
 			case 'currenttimestamp':
 				$value = wfTimestamp( TS_MW, $ts );
 				break;
 			case 'localtimestamp':
-				$value = $localTimestamp;
+				$value = MWTimestamp::getLocalInstance( $ts )->format( 'YmdHis' );
 				break;
 			case 'currentversion':
 				$value = SpecialVersion::getVersion();
@@ -2719,30 +2788,35 @@ class Parser {
 			case 'server':
 				return $wgServer;
 			case 'servername':
-				wfSuppressWarnings(); # May give an E_WARNING in PHP < 5.3.3
-				$serverName = parse_url( $wgServer, PHP_URL_HOST );
-				wfRestoreWarnings();
-				return $serverName ? $serverName : $wgServer;
+				return $wgServerName;
 			case 'scriptpath':
 				return $wgScriptPath;
 			case 'stylepath':
 				return $wgStylePath;
 			case 'directionmark':
-				return $wgContLang->getDirMark();
+				return $pageLang->getDirMark();
 			case 'contentlanguage':
 				global $wgLanguageCode;
 				return $wgLanguageCode;
+			case 'pagelanguage':
+				$value = $pageLang->getCode();
+				break;
+			case 'cascadingsources':
+				$value = CoreParserFunctions::cascadingsources( $this );
+				break;
 			default:
 				$ret = null;
-				if ( wfRunHooks( 'ParserGetVariableValueSwitch', array( &$this, &$this->mVarCache, &$index, &$ret, &$frame ) ) ) {
-					return $ret;
-				} else {
-					return null;
-				}
+				Hooks::run(
+					'ParserGetVariableValueSwitch',
+					[ &$parser, &$this->mVarCache, &$index, &$ret, &$frame ]
+				);
+
+				return $ret;
 		}
 
-		if ( $index )
+		if ( $index ) {
 			$this->mVarCache[$index] = $value;
+		}
 
 		return $value;
 	}
@@ -2752,27 +2826,25 @@ class Parser {
 	 *
 	 * @private
 	 */
-	function initialiseVariables() {
-		wfProfileIn( __METHOD__ );
+	public function initialiseVariables() {
 		$variableIDs = MagicWord::getVariableIDs();
 		$substIDs = MagicWord::getSubstIDs();
 
 		$this->mVariables = new MagicWordArray( $variableIDs );
 		$this->mSubstWords = new MagicWordArray( $substIDs );
-		wfProfileOut( __METHOD__ );
 	}
 
 	/**
 	 * Preprocess some wikitext and return the document tree.
 	 * This is the ghost of replace_variables().
 	 *
-	 * @param $text String: The text to parse
-	 * @param $flags Integer: bitwise combination of:
-	 *          self::PTD_FOR_INCLUSION    Handle / as if the text is being
-	 *                                     included. Default is to assume a direct page view.
+	 * @param string $text The text to parse
+	 * @param int $flags Bitwise combination of:
+	 *   - self::PTD_FOR_INCLUSION: Handle "" and "" as if the text is being
+	 *     included. Default is to assume a direct page view.
 	 *
 	 * The generated DOM tree must depend only on the input text and the flags.
-	 * The DOM tree must be the same in OT_HTML and OT_WIKI mode, to avoid a regression of bug 4899.
+	 * The DOM tree must be the same in OT_HTML and OT_WIKI mode, to avoid a regression of T6899.
 	 *
 	 * Any flag added to the $flags parameter here, or any other parameter liable to cause a
 	 * change in the DOM tree for a given text, must be passed through the section identifier
@@ -2782,15 +2854,19 @@ class Parser {
 	 * cache may be implemented at a later date which takes further advantage of these strict
 	 * dependency requirements.
 	 *
-	 * @private
+	 * @return PPNode
 	 */
-	function preprocessToDom( $text, $flags = 0 ) {
+	public function preprocessToDom( $text, $flags = 0 ) {
 		$dom = $this->getPreprocessor()->preprocessToObj( $text, $flags );
 		return $dom;
 	}
 
 	/**
 	 * Return a three-element array: leading whitespace, string contents, trailing whitespace
+	 *
+	 * @param string $s
+	 *
+	 * @return array
 	 */
 	public static function splitWhitespace( $s ) {
 		$ltrimmed = ltrim( $s );
@@ -2802,7 +2878,7 @@ class Parser {
 		} else {
 			$w2 = '';
 		}
-		return array( $w1, $trimmed, $w2 );
+		return [ $w1, $trimmed, $w2 ];
 	}
 
 	/**
@@ -2815,24 +2891,28 @@ class Parser {
 	 *  self::OT_PREPROCESS: templates but not extension tags
 	 *  self::OT_HTML: all templates and extension tags
 	 *
-	 * @param $text String: the text to transform
-	 * @param $frame PPFrame Object describing the arguments passed to the template.
-	 *        Arguments may also be provided as an associative array, as was the usual case before MW1.12.
-	 *        Providing arguments this way may be useful for extensions wishing to perform variable replacement explicitly.
-	 * @param $argsOnly Boolean: only do argument (triple-brace) expansion, not double-brace expansion
-	 * @private
+	 * @param string $text The text to transform
+	 * @param bool|PPFrame $frame Object describing the arguments passed to the
+	 *   template. Arguments may also be provided as an associative array, as
+	 *   was the usual case before MW1.12. Providing arguments this way may be
+	 *   useful for extensions wishing to perform variable replacement
+	 *   explicitly.
+	 * @param bool $argsOnly Only do argument (triple-brace) expansion, not
+	 *   double-brace expansion.
+	 * @return string
 	 */
-	function replaceVariables( $text, $frame = false, $argsOnly = false ) {
+	public function replaceVariables( $text, $frame = false, $argsOnly = false ) {
 		# Is there any text? Also, Prevent too big inclusions!
-		if ( strlen( $text ) < 1 || strlen( $text ) > $this->mOptions->getMaxIncludeSize() ) {
+		$textSize = strlen( $text );
+		if ( $textSize < 1 || $textSize > $this->mOptions->getMaxIncludeSize() ) {
 			return $text;
 		}
-		wfProfileIn( __METHOD__ );
 
 		if ( $frame === false ) {
 			$frame = $this->getPreprocessor()->newFrame();
 		} elseif ( !( $frame instanceof PPFrame ) ) {
-			wfDebug( __METHOD__." called using plain parameters instead of a PPFrame instance. Creating custom frame.\n" );
+			wfDebug( __METHOD__ . " called using plain parameters instead of "
+				. "a PPFrame instance. Creating custom frame.\n" );
 			$frame = $this->getPreprocessor()->newCustomFrame( $frame );
 		}
 
@@ -2840,13 +2920,18 @@ class Parser {
 		$flags = $argsOnly ? PPFrame::NO_TEMPLATES : 0;
 		$text = $frame->expand( $dom, $flags );
 
-		wfProfileOut( __METHOD__ );
 		return $text;
 	}
 
-	# Clean up argument array - refactored in 1.9 so parserfunctions can use it, too.
-	static function createAssocArgs( $args ) {
-		$assocArgs = array();
+	/**
+	 * Clean up argument array - refactored in 1.9 so parserfunctions can use it, too.
+	 *
+	 * @param array $args
+	 *
+	 * @return array
+	 */
+	public static function createAssocArgs( $args ) {
+		$assocArgs = [];
 		$index = 1;
 		foreach ( $args as $arg ) {
 			$eqpos = strpos( $arg, '=' );
@@ -2854,7 +2939,7 @@ class Parser {
 				$assocArgs[$index++] = $arg;
 			} else {
 				$name = trim( substr( $arg, 0, $eqpos ) );
-				$value = trim( substr( $arg, $eqpos+1 ) );
+				$value = trim( substr( $arg, $eqpos + 1 ) );
 				if ( $value === false ) {
 					$value = '';
 				}
@@ -2871,7 +2956,9 @@ class Parser {
 	 * Warn the user when a parser limitation is reached
 	 * Will warn at most once the user per limitation type
 	 *
-	 * @param $limitationType String: should be one of:
+	 * The results are shown during preview and run through the Parser (See EditPage.php)
+	 *
+	 * @param string $limitationType Should be one of:
 	 *   'expensive-parserfunction' (corresponding messages:
 	 *       'expensive-parserfunction-warning',
 	 *       'expensive-parserfunction-category')
@@ -2881,13 +2968,22 @@ class Parser {
 	 *   'post-expand-template-inclusion' (corresponding messages:
 	 *       'post-expand-template-inclusion-warning',
 	 *       'post-expand-template-inclusion-category')
-	 * @param $current Current value
-	 * @param $max Maximum allowed, when an explicit limit has been
+	 *   'node-count-exceeded' (corresponding messages:
+	 *       'node-count-exceeded-warning',
+	 *       'node-count-exceeded-category')
+	 *   'expansion-depth-exceeded' (corresponding messages:
+	 *       'expansion-depth-exceeded-warning',
+	 *       'expansion-depth-exceeded-category')
+	 * @param string|int|null $current Current value
+	 * @param string|int|null $max Maximum allowed, when an explicit limit has been
 	 *	 exceeded, provide the values (optional)
 	 */
-	function limitationWarn( $limitationType, $current=null, $max=null) {
+	public function limitationWarn( $limitationType, $current = '', $max = '' ) {
 		# does no harm if $current and $max are present but are unnecessary for the message
-		$warning = wfMsgExt( "$limitationType-warning", array( 'parsemag', 'escape' ), $current, $max );
+		# Not doing ->inLanguage( $this->mOptions->getUserLangObj() ), since this is shown
+		# only during preview, and that would split the parser cache unnecessarily.
+		$warning = wfMessage( "$limitationType-warning" )->numParams( $current, $max )
+			->text();
 		$this->mOutput->addWarning( $warning );
 		$this->addTrackingCategory( "$limitationType-category" );
 	}
@@ -2896,29 +2992,32 @@ class Parser {
 	 * Return the text of a template, after recursively
 	 * replacing any variables or templates within the template.
 	 *
-	 * @param $piece Array: the parts of the template
-	 *  $piece['title']: the title, i.e. the part before the |
-	 *  $piece['parts']: the parameter array
-	 *  $piece['lineStart']: whether the brace was at the start of a line
-	 * @param $frame PPFrame The current frame, contains template arguments
-	 * @return String: the text of the template
-	 * @private
+	 * @param array $piece The parts of the template
+	 *   $piece['title']: the title, i.e. the part before the |
+	 *   $piece['parts']: the parameter array
+	 *   $piece['lineStart']: whether the brace was at the start of a line
+	 * @param PPFrame $frame The current frame, contains template arguments
+	 * @throws Exception
+	 * @return string The text of the template
 	 */
-	function braceSubstitution( $piece, $frame ) {
-		global $wgContLang, $wgNonincludableNamespaces;
-		wfProfileIn( __METHOD__ );
-		wfProfileIn( __METHOD__.'-setup' );
-
-		# Flags
-		$found = false;             # $text has been filled
-		$nowiki = false;            # wiki markup in $text should be escaped
-		$isHTML = false;            # $text is HTML, armour it against wikitext transformation
-		$forceRawInterwiki = false; # Force interwiki transclusion to be done in raw mode not rendered
-		$isChildObj = false;        # $text is a DOM node needing expansion in a child frame
-		$isLocalObj = false;        # $text is a DOM node needing expansion in the current frame
+	public function braceSubstitution( $piece, $frame ) {
+		// Flags
+
+		// $text has been filled
+		$found = false;
+		// wiki markup in $text should be escaped
+		$nowiki = false;
+		// $text is HTML, armour it against wikitext transformation
+		$isHTML = false;
+		// Force interwiki transclusion to be done in raw mode not rendered
+		$forceRawInterwiki = false;
+		// $text is a DOM node needing expansion in a child frame
+		$isChildObj = false;
+		// $text is a DOM node needing expansion in the current frame
+		$isLocalObj = false;
 
 		# Title object, where $text came from
-		$title = null;
+		$title = false;
 
 		# $part1 is the bit before the first |, and must contain only title characters.
 		# Various prefixes will be stripped from it later.
@@ -2930,13 +3029,14 @@ class Parser {
 		$originalTitle = $part1;
 
 		# $args is a list of argument nodes, starting from index 0, not including $part1
-		$args = ( null == $piece['parts'] ) ? array() : $piece['parts'];
-		wfProfileOut( __METHOD__.'-setup' );
+		# @todo FIXME: If piece['parts'] is null then the call to getLength()
+		# below won't work b/c this $args isn't an object
+		$args = ( null == $piece['parts'] ) ? [] : $piece['parts'];
+
+		$profileSection = null; // profile templates
 
 		# SUBST
-		wfProfileIn( __METHOD__.'-modifiers' );
 		if ( !$found ) {
-
 			$substMatch = $this->mSubstWords->matchStartAndRemove( $part1 );
 
 			# Possibilities for substMatch: "subst", "safesubst" or FALSE
@@ -2991,77 +3091,28 @@ class Parser {
 				$forceRawInterwiki = true;
 			}
 		}
-		wfProfileOut( __METHOD__.'-modifiers' );
 
 		# Parser functions
 		if ( !$found ) {
-			wfProfileIn( __METHOD__ . '-pfunc' );
-
 			$colonPos = strpos( $part1, ':' );
 			if ( $colonPos !== false ) {
-				# Case sensitive functions
-				$function = substr( $part1, 0, $colonPos );
-				if ( isset( $this->mFunctionSynonyms[1][$function] ) ) {
-					$function = $this->mFunctionSynonyms[1][$function];
-				} else {
-					# Case insensitive functions
-					$function = $wgContLang->lc( $function );
-					if ( isset( $this->mFunctionSynonyms[0][$function] ) ) {
-						$function = $this->mFunctionSynonyms[0][$function];
-					} else {
-						$function = false;
-					}
+				$func = substr( $part1, 0, $colonPos );
+				$funcArgs = [ trim( substr( $part1, $colonPos + 1 ) ) ];
+				$argsLength = $args->getLength();
+				for ( $i = 0; $i < $argsLength; $i++ ) {
+					$funcArgs[] = $args->item( $i );
 				}
-				if ( $function ) {
-					list( $callback, $flags ) = $this->mFunctionHooks[$function];
-					$initialArgs = array( &$this );
-					$funcArgs = array( trim( substr( $part1, $colonPos + 1 ) ) );
-					if ( $flags & SFH_OBJECT_ARGS ) {
-						# Add a frame parameter, and pass the arguments as an array
-						$allArgs = $initialArgs;
-						$allArgs[] = $frame;
-						for ( $i = 0; $i < $args->getLength(); $i++ ) {
-							$funcArgs[] = $args->item( $i );
-						}
-						$allArgs[] = $funcArgs;
-					} else {
-						# Convert arguments to plain text
-						for ( $i = 0; $i < $args->getLength(); $i++ ) {
-							$funcArgs[] = trim( $frame->expand( $args->item( $i ) ) );
-						}
-						$allArgs = array_merge( $initialArgs, $funcArgs );
-					}
-
-					# Workaround for PHP bug 35229 and similar
-					if ( !is_callable( $callback ) ) {
-						wfProfileOut( __METHOD__ . '-pfunc' );
-						wfProfileOut( __METHOD__ );
-						throw new MWException( "Tag hook for $function is not callable\n" );
-					}
-					$result = call_user_func_array( $callback, $allArgs );
-					$found = true;
-					$noparse = true;
-					$preprocessFlags = 0;
-
-					if ( is_array( $result ) ) {
-						if ( isset( $result[0] ) ) {
-							$text = $result[0];
-							unset( $result[0] );
-						}
-
-						# Extract flags into the local scope
-						# This allows callers to set flags such as nowiki, found, etc.
-						extract( $result );
-					} else {
-						$text = $result;
-					}
-					if ( !$noparse ) {
-						$text = $this->preprocessToDom( $text, $preprocessFlags );
-						$isChildObj = true;
-					}
+				try {
+					$result = $this->callParserFunction( $frame, $func, $funcArgs );
+				} catch ( Exception $ex ) {
+					throw $ex;
 				}
+
+				# The interface for parser functions allows for extracting
+				# flags into the local scope. Extract any forwarded flags
+				# here.
+				extract( $result );
 			}
-			wfProfileOut( __METHOD__ . '-pfunc' );
 		}
 
 		# Finish mangling title and then check for loops.
@@ -3070,23 +3121,25 @@ class Parser {
 			$ns = NS_TEMPLATE;
 			# Split the title into page and subpage
 			$subpage = '';
-			$part1 = $this->maybeDoSubpageLink( $part1, $subpage );
-			if ( $subpage !== '' ) {
+			$relative = $this->maybeDoSubpageLink( $part1, $subpage );
+			if ( $part1 !== $relative ) {
+				$part1 = $relative;
 				$ns = $this->mTitle->getNamespace();
 			}
 			$title = Title::newFromText( $part1, $ns );
 			if ( $title ) {
 				$titleText = $title->getPrefixedText();
 				# Check for language variants if the template is not found
-				if ( $wgContLang->hasVariants() && $title->getArticleID() == 0 ) {
-					$wgContLang->findVariantLink( $part1, $title, true );
+				if ( $this->getConverterLanguage()->hasVariants() && $title->getArticleID() == 0 ) {
+					$this->getConverterLanguage()->findVariantLink( $part1, $title, true );
 				}
 				# Do recursion depth check
 				$limit = $this->mOptions->getMaxTemplateDepth();
 				if ( $frame->depth >= $limit ) {
 					$found = true;
 					$text = ''
-						. wfMsgForContent( 'parser-template-recursion-depth-warning', $limit )
+						. wfMessage( 'parser-template-recursion-depth-warning' )
+							->numParams( $limit )->inContentLanguage()->text()
 						. '';
 				}
 			}
@@ -3094,21 +3147,55 @@ class Parser {
 
 		# Load from database
 		if ( !$found && $title ) {
-			wfProfileIn( __METHOD__ . '-loadtpl' );
+			$profileSection = $this->mProfiler->scopedProfileIn( $title->getPrefixedDBkey() );
 			if ( !$title->isExternal() ) {
-				if ( $title->getNamespace() == NS_SPECIAL
+				if ( $title->isSpecialPage()
 					&& $this->mOptions->getAllowSpecialInclusion()
-					&& $this->ot['html'] )
-				{
-					$text = SpecialPage::capturePath( $title );
-					if ( is_string( $text ) ) {
+					&& $this->ot['html']
+				) {
+					$specialPage = SpecialPageFactory::getPage( $title->getDBkey() );
+					// Pass the template arguments as URL parameters.
+					// "uselang" will have no effect since the Language object
+					// is forced to the one defined in ParserOptions.
+					$pageArgs = [];
+					$argsLength = $args->getLength();
+					for ( $i = 0; $i < $argsLength; $i++ ) {
+						$bits = $args->item( $i )->splitArg();
+						if ( strval( $bits['index'] ) === '' ) {
+							$name = trim( $frame->expand( $bits['name'], PPFrame::STRIP_COMMENTS ) );
+							$value = trim( $frame->expand( $bits['value'] ) );
+							$pageArgs[$name] = $value;
+						}
+					}
+
+					// Create a new context to execute the special page
+					$context = new RequestContext;
+					$context->setTitle( $title );
+					$context->setRequest( new FauxRequest( $pageArgs ) );
+					if ( $specialPage && $specialPage->maxIncludeCacheTime() === 0 ) {
+						$context->setUser( $this->getUser() );
+					} else {
+						// If this page is cached, then we better not be per user.
+						$context->setUser( User::newFromName( '127.0.0.1', false ) );
+					}
+					$context->setLanguage( $this->mOptions->getUserLangObj() );
+					$ret = SpecialPageFactory::capturePath(
+						$title, $context, $this->getLinkRenderer() );
+					if ( $ret ) {
+						$text = $context->getOutput()->getHTML();
+						$this->mOutput->addOutputPageMetadata( $context->getOutput() );
 						$found = true;
 						$isHTML = true;
-						$this->disableCache();
+						if ( $specialPage && $specialPage->maxIncludeCacheTime() !== false ) {
+							$this->mOutput->updateRuntimeAdaptiveExpiry(
+								$specialPage->maxIncludeCacheTime()
+							);
+						}
 					}
-				} elseif ( $wgNonincludableNamespaces && in_array( $title->getNamespace(), $wgNonincludableNamespaces ) ) {
+				} elseif ( MWNamespace::isNonincludable( $title->getNamespace() ) ) {
 					$found = false; # access denied
-					wfDebug( __METHOD__.": template inclusion denied for " . $title->getPrefixedDBkey() );
+					wfDebug( __METHOD__ . ": template inclusion denied for " .
+						$title->getPrefixedDBkey() . "\n" );
 				} else {
 					list( $text, $title ) = $this->getTemplateDom( $title );
 					if ( $text !== false ) {
@@ -3140,18 +3227,24 @@ class Parser {
 			# This has to be done after redirect resolution to avoid infinite loops via redirects
 			if ( !$frame->loopCheck( $title ) ) {
 				$found = true;
-				$text = '' . wfMsgForContent( 'parser-template-loop-warning', $titleText ) . '';
-				wfDebug( __METHOD__.": template loop broken at '$titleText'\n" );
+				$text = ''
+					. wfMessage( 'parser-template-loop-warning', $titleText )->inContentLanguage()->text()
+					. '';
+				$this->addTrackingCategory( 'template-loop-category' );
+				$this->mOutput->addWarning( wfMessage( 'template-loop-warning',
+					wfEscapeWikiText( $titleText ) )->text() );
+				wfDebug( __METHOD__ . ": template loop broken at '$titleText'\n" );
 			}
-			wfProfileOut( __METHOD__ . '-loadtpl' );
 		}
 
 		# If we haven't found text to substitute by now, we're done
 		# Recover the source wikitext and return it
 		if ( !$found ) {
 			$text = $frame->virtualBracketedImplode( '{{', '|', '}}', $titleWithSpaces, $args );
-			wfProfileOut( __METHOD__ );
-			return array( 'object' => $text );
+			if ( $profileSection ) {
+				$this->mProfiler->scopedProfileOut( $profileSection );
+			}
+			return [ 'object' => $text ];
 		}
 
 		# Expand DOM-style return values in a child frame
@@ -3163,12 +3256,7 @@ class Parser {
 				$text = $newFrame->expand( $text, PPFrame::RECOVER_ORIG );
 			} elseif ( $titleText !== false && $newFrame->isEmpty() ) {
 				# Expansion is eligible for the empty-frame cache
-				if ( isset( $this->mTplExpandCache[$titleText] ) ) {
-					$text = $this->mTplExpandCache[$titleText];
-				} else {
-					$text = $newFrame->expand( $text );
-					$this->mTplExpandCache[$titleText] = $text;
-				}
+				$text = $newFrame->cachedExpand( $titleText, $text );
 			} else {
 				# Uncached expansion
 				$text = $newFrame->expand( $text );
@@ -3179,28 +3267,30 @@ class Parser {
 			$isLocalObj = false;
 		}
 
+		if ( $profileSection ) {
+			$this->mProfiler->scopedProfileOut( $profileSection );
+		}
+
 		# Replace raw HTML by a placeholder
-		# Add a blank line preceding, to prevent it from mucking up
-		# immediately preceding headings
 		if ( $isHTML ) {
-			$text = "\n\n" . $this->insertStripItem( $text );
+			$text = $this->insertStripItem( $text );
 		} elseif ( $nowiki && ( $this->ot['html'] || $this->ot['pre'] ) ) {
 			# Escape nowiki-style return values
 			$text = wfEscapeWikiText( $text );
 		} elseif ( is_string( $text )
 			&& !$piece['lineStart']
-			&& preg_match( '/^(?:{\\||:|;|#|\*)/', $text ) )
-		{
-			# Bug 529: if the template begins with a table or block-level
+			&& preg_match( '/^(?:{\\||:|;|#|\*)/', $text )
+		) {
+			# T2529: if the template begins with a table or block-level
 			# element, it should be treated as beginning a new line.
-			# This behaviour is somewhat controversial.
+			# This behavior is somewhat controversial.
 			$text = "\n" . $text;
 		}
 
 		if ( is_string( $text ) && !$this->incrementIncludeSize( 'post-expand', strlen( $text ) ) ) {
 			# Error, oversize inclusion
 			if ( $titleText !== false ) {
-				# Make a working, properly escaped link if possible (bug 23588)
+				# Make a working, properly escaped link if possible (T25588)
 				$text = "[[:$titleText]]";
 			} else {
 				# This will probably not be a working link, but at least it may
@@ -3208,25 +3298,134 @@ class Parser {
 				preg_replace( '/^:/', '', $originalTitle );
 				$text = "[[:$originalTitle]]";
 			}
-			$text .= $this->insertStripItem( '' );
+			$text .= $this->insertStripItem( '' );
 			$this->limitationWarn( 'post-expand-template-inclusion' );
 		}
 
 		if ( $isLocalObj ) {
-			$ret = array( 'object' => $text );
+			$ret = [ 'object' => $text ];
 		} else {
-			$ret = array( 'text' => $text );
+			$ret = [ 'text' => $text ];
 		}
 
-		wfProfileOut( __METHOD__ );
 		return $ret;
 	}
 
+	/**
+	 * Call a parser function and return an array with text and flags.
+	 *
+	 * The returned array will always contain a boolean 'found', indicating
+	 * whether the parser function was found or not. It may also contain the
+	 * following:
+	 *  text: string|object, resulting wikitext or PP DOM object
+	 *  isHTML: bool, $text is HTML, armour it against wikitext transformation
+	 *  isChildObj: bool, $text is a DOM node needing expansion in a child frame
+	 *  isLocalObj: bool, $text is a DOM node needing expansion in the current frame
+	 *  nowiki: bool, wiki markup in $text should be escaped
+	 *
+	 * @since 1.21
+	 * @param PPFrame $frame The current frame, contains template arguments
+	 * @param string $function Function name
+	 * @param array $args Arguments to the function
+	 * @throws MWException
+	 * @return array
+	 */
+	public function callParserFunction( $frame, $function, array $args = [] ) {
+		global $wgContLang;
+
+		# Case sensitive functions
+		if ( isset( $this->mFunctionSynonyms[1][$function] ) ) {
+			$function = $this->mFunctionSynonyms[1][$function];
+		} else {
+			# Case insensitive functions
+			$function = $wgContLang->lc( $function );
+			if ( isset( $this->mFunctionSynonyms[0][$function] ) ) {
+				$function = $this->mFunctionSynonyms[0][$function];
+			} else {
+				return [ 'found' => false ];
+			}
+		}
+
+		list( $callback, $flags ) = $this->mFunctionHooks[$function];
+
+		// Avoid PHP 7.1 warning from passing $this by reference
+		$parser = $this;
+
+		$allArgs = [ &$parser ];
+		if ( $flags & self::SFH_OBJECT_ARGS ) {
+			# Convert arguments to PPNodes and collect for appending to $allArgs
+			$funcArgs = [];
+			foreach ( $args as $k => $v ) {
+				if ( $v instanceof PPNode || $k === 0 ) {
+					$funcArgs[] = $v;
+				} else {
+					$funcArgs[] = $this->mPreprocessor->newPartNodeArray( [ $k => $v ] )->item( 0 );
+				}
+			}
+
+			# Add a frame parameter, and pass the arguments as an array
+			$allArgs[] = $frame;
+			$allArgs[] = $funcArgs;
+		} else {
+			# Convert arguments to plain text and append to $allArgs
+			foreach ( $args as $k => $v ) {
+				if ( $v instanceof PPNode ) {
+					$allArgs[] = trim( $frame->expand( $v ) );
+				} elseif ( is_int( $k ) && $k >= 0 ) {
+					$allArgs[] = trim( $v );
+				} else {
+					$allArgs[] = trim( "$k=$v" );
+				}
+			}
+		}
+
+		$result = call_user_func_array( $callback, $allArgs );
+
+		# The interface for function hooks allows them to return a wikitext
+		# string or an array containing the string and any flags. This mungs
+		# things around to match what this method should return.
+		if ( !is_array( $result ) ) {
+			$result = [
+				'found' => true,
+				'text' => $result,
+			];
+		} else {
+			if ( isset( $result[0] ) && !isset( $result['text'] ) ) {
+				$result['text'] = $result[0];
+			}
+			unset( $result[0] );
+			$result += [
+				'found' => true,
+			];
+		}
+
+		$noparse = true;
+		$preprocessFlags = 0;
+		if ( isset( $result['noparse'] ) ) {
+			$noparse = $result['noparse'];
+		}
+		if ( isset( $result['preprocessFlags'] ) ) {
+			$preprocessFlags = $result['preprocessFlags'];
+		}
+
+		if ( !$noparse ) {
+			$result['text'] = $this->preprocessToDom( $result['text'], $preprocessFlags );
+			$result['isChildObj'] = true;
+		}
+
+		return $result;
+	}
+
 	/**
 	 * Get the semi-parsed DOM representation of a template with a given title,
 	 * and its redirect destination title. Cached.
+	 *
+	 * @param Title $title
+	 *
+	 * @return array
 	 */
-	function getTemplateDom( $title ) {
+	public function getTemplateDom( $title ) {
 		$cacheTitle = $title;
 		$titleText = $title->getPrefixedDBkey();
 
@@ -3236,7 +3435,7 @@ class Parser {
 			$titleText = $title->getPrefixedDBkey();
 		}
 		if ( isset( $this->mTplDomCache[$titleText] ) ) {
-			return array( $this->mTplDomCache[$titleText], $title );
+			return [ $this->mTplDomCache[$titleText], $title ];
 		}
 
 		# Cache miss, go to the database
@@ -3244,65 +3443,143 @@ class Parser {
 
 		if ( $text === false ) {
 			$this->mTplDomCache[$titleText] = false;
-			return array( false, $title );
+			return [ false, $title ];
 		}
 
 		$dom = $this->preprocessToDom( $text, self::PTD_FOR_INCLUSION );
-		$this->mTplDomCache[ $titleText ] = $dom;
+		$this->mTplDomCache[$titleText] = $dom;
 
 		if ( !$title->equals( $cacheTitle ) ) {
 			$this->mTplRedirCache[$cacheTitle->getPrefixedDBkey()] =
-				array( $title->getNamespace(), $cdb = $title->getDBkey() );
+				[ $title->getNamespace(), $title->getDBkey() ];
+		}
+
+		return [ $dom, $title ];
+	}
+
+	/**
+	 * Fetch the current revision of a given title. Note that the revision
+	 * (and even the title) may not exist in the database, so everything
+	 * contributing to the output of the parser should use this method
+	 * where possible, rather than getting the revisions themselves. This
+	 * method also caches its results, so using it benefits performance.
+	 *
+	 * @since 1.24
+	 * @param Title $title
+	 * @return Revision
+	 */
+	public function fetchCurrentRevisionOfTitle( $title ) {
+		$cacheKey = $title->getPrefixedDBkey();
+		if ( !$this->currentRevisionCache ) {
+			$this->currentRevisionCache = new MapCacheLRU( 100 );
+		}
+		if ( !$this->currentRevisionCache->has( $cacheKey ) ) {
+			$this->currentRevisionCache->set( $cacheKey,
+				// Defaults to Parser::statelessFetchRevision()
+				call_user_func( $this->mOptions->getCurrentRevisionCallback(), $title, $this )
+			);
+		}
+		return $this->currentRevisionCache->get( $cacheKey );
+	}
+
+	/**
+	 * Wrapper around Revision::newFromTitle to allow passing additional parameters
+	 * without passing them on to it.
+	 *
+	 * @since 1.24
+	 * @param Title $title
+	 * @param Parser|bool $parser
+	 * @return Revision|bool False if missing
+	 */
+	public static function statelessFetchRevision( Title $title, $parser = false ) {
+		$pageId = $title->getArticleID();
+		$revId = $title->getLatestRevID();
+
+		$rev = Revision::newKnownCurrent( wfGetDB( DB_REPLICA ), $pageId, $revId );
+		if ( $rev ) {
+			$rev->setTitle( $title );
 		}
 
-		return array( $dom, $title );
+		return $rev;
 	}
 
 	/**
 	 * Fetch the unparsed text of a template and register a reference to it.
+	 * @param Title $title
+	 * @return array ( string or false, Title )
 	 */
-	function fetchTemplateAndTitle( $title ) {
-		$templateCb = $this->mOptions->getTemplateCallback(); # Defaults to Parser::statelessFetchTemplate()
+	public function fetchTemplateAndTitle( $title ) {
+		// Defaults to Parser::statelessFetchTemplate()
+		$templateCb = $this->mOptions->getTemplateCallback();
 		$stuff = call_user_func( $templateCb, $title, $this );
+		// We use U+007F DELETE to distinguish strip markers from regular text.
 		$text = $stuff['text'];
+		if ( is_string( $stuff['text'] ) ) {
+			$text = strtr( $text, "\x7f", "?" );
+		}
 		$finalTitle = isset( $stuff['finalTitle'] ) ? $stuff['finalTitle'] : $title;
 		if ( isset( $stuff['deps'] ) ) {
 			foreach ( $stuff['deps'] as $dep ) {
 				$this->mOutput->addTemplate( $dep['title'], $dep['page_id'], $dep['rev_id'] );
+				if ( $dep['title']->equals( $this->getTitle() ) ) {
+					// If we transclude ourselves, the final result
+					// will change based on the new version of the page
+					$this->mOutput->setFlag( 'vary-revision' );
+				}
 			}
 		}
-		return array( $text, $finalTitle );
+		return [ $text, $finalTitle ];
 	}
 
-	function fetchTemplate( $title ) {
-		$rv = $this->fetchTemplateAndTitle( $title );
-		return $rv[0];
+	/**
+	 * Fetch the unparsed text of a template and register a reference to it.
+	 * @param Title $title
+	 * @return string|bool
+	 */
+	public function fetchTemplate( $title ) {
+		return $this->fetchTemplateAndTitle( $title )[0];
 	}
 
 	/**
 	 * Static function to get a template
 	 * Can be overridden via ParserOptions::setTemplateCallback().
+	 *
+	 * @param Title $title
+	 * @param bool|Parser $parser
+	 *
+	 * @return array
 	 */
-	static function statelessFetchTemplate( $title, $parser=false ) {
+	public static function statelessFetchTemplate( $title, $parser = false ) {
 		$text = $skip = false;
 		$finalTitle = $title;
-		$deps = array();
+		$deps = [];
 
 		# Loop to fetch the article, with up to 1 redirect
+		// @codingStandardsIgnoreStart Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed
 		for ( $i = 0; $i < 2 && is_object( $title ); $i++ ) {
+			// @codingStandardsIgnoreEnd
 			# Give extensions a chance to select the revision instead
 			$id = false; # Assume current
-			wfRunHooks( 'BeforeParserFetchTemplateAndtitle', array( $parser, &$title, &$skip, &$id ) );
+			Hooks::run( 'BeforeParserFetchTemplateAndtitle',
+				[ $parser, $title, &$skip, &$id ] );
 
 			if ( $skip ) {
 				$text = false;
-				$deps[] = array(
+				$deps[] = [
 					'title' => $title,
 					'page_id' => $title->getArticleID(),
-					'rev_id' => null );
+					'rev_id' => null
+				];
 				break;
 			}
-			$rev = $id ? Revision::newFromId( $id ) : Revision::newFromTitle( $title );
+			# Get the revision
+			if ( $id ) {
+				$rev = Revision::newFromId( $id );
+			} elseif ( $parser ) {
+				$rev = $parser->fetchCurrentRevisionOfTitle( $title );
+			} else {
+				$rev = Revision::newFromTitle( $title );
+			}
 			$rev_id = $rev ? $rev->getId() : 0;
 			# If there is no current revision, there is no page
 			if ( $id === false && !$rev ) {
@@ -3310,99 +3587,187 @@ class Parser {
 				$linkCache->addBadLinkObj( $title );
 			}
 
-			$deps[] = array(
+			$deps[] = [
 				'title' => $title,
 				'page_id' => $title->getArticleID(),
-				'rev_id' => $rev_id );
+				'rev_id' => $rev_id ];
+			if ( $rev && !$title->equals( $rev->getTitle() ) ) {
+				# We fetched a rev from a different title; register it too...
+				$deps[] = [
+					'title' => $rev->getTitle(),
+					'page_id' => $rev->getPage(),
+					'rev_id' => $rev_id ];
+			}
 
 			if ( $rev ) {
-				$text = $rev->getText();
+				$content = $rev->getContent();
+				$text = $content ? $content->getWikitextForTransclusion() : null;
+
+				Hooks::run( 'ParserFetchTemplate',
+					[ $parser, $title, $rev, &$text, &$deps ] );
+
+				if ( $text === false || $text === null ) {
+					$text = false;
+					break;
+				}
 			} elseif ( $title->getNamespace() == NS_MEDIAWIKI ) {
 				global $wgContLang;
-				$message = $wgContLang->lcfirst( $title->getText() );
-				$text = wfMsgForContentNoTrans( $message );
-				if ( wfEmptyMsg( $message, $text ) ) {
+				$message = wfMessage( $wgContLang->lcfirst( $title->getText() ) )->inContentLanguage();
+				if ( !$message->exists() ) {
 					$text = false;
 					break;
 				}
+				$content = $message->content();
+				$text = $message->plain();
 			} else {
 				break;
 			}
-			if ( $text === false ) {
+			if ( !$content ) {
 				break;
 			}
 			# Redirect?
 			$finalTitle = $title;
-			$title = Title::newFromRedirect( $text );
+			$title = $content->getRedirectTarget();
 		}
-		return array(
+		return [
 			'text' => $text,
 			'finalTitle' => $finalTitle,
-			'deps' => $deps );
+			'deps' => $deps ];
+	}
+
+	/**
+	 * Fetch a file and its title and register a reference to it.
+	 * If 'broken' is a key in $options then the file will appear as a broken thumbnail.
+	 * @param Title $title
+	 * @param array $options Array of options to RepoGroup::findFile
+	 * @return File|bool
+	 */
+	public function fetchFile( $title, $options = [] ) {
+		return $this->fetchFileAndTitle( $title, $options )[0];
+	}
+
+	/**
+	 * Fetch a file and its title and register a reference to it.
+	 * If 'broken' is a key in $options then the file will appear as a broken thumbnail.
+	 * @param Title $title
+	 * @param array $options Array of options to RepoGroup::findFile
+	 * @return array ( File or false, Title of file )
+	 */
+	public function fetchFileAndTitle( $title, $options = [] ) {
+		$file = $this->fetchFileNoRegister( $title, $options );
+
+		$time = $file ? $file->getTimestamp() : false;
+		$sha1 = $file ? $file->getSha1() : false;
+		# Register the file as a dependency...
+		$this->mOutput->addImage( $title->getDBkey(), $time, $sha1 );
+		if ( $file && !$title->equals( $file->getTitle() ) ) {
+			# Update fetched file title
+			$title = $file->getTitle();
+			$this->mOutput->addImage( $title->getDBkey(), $time, $sha1 );
+		}
+		return [ $file, $title ];
+	}
+
+	/**
+	 * Helper function for fetchFileAndTitle.
+	 *
+	 * Also useful if you need to fetch a file but not use it yet,
+	 * for example to get the file's handler.
+	 *
+	 * @param Title $title
+	 * @param array $options Array of options to RepoGroup::findFile
+	 * @return File|bool
+	 */
+	protected function fetchFileNoRegister( $title, $options = [] ) {
+		if ( isset( $options['broken'] ) ) {
+			$file = false; // broken thumbnail forced by hook
+		} elseif ( isset( $options['sha1'] ) ) { // get by (sha1,timestamp)
+			$file = RepoGroup::singleton()->findFileFromKey( $options['sha1'], $options );
+		} else { // get by (name,timestamp)
+			$file = wfFindFile( $title, $options );
+		}
+		return $file;
 	}
 
 	/**
 	 * Transclude an interwiki link.
+	 *
+	 * @param Title $title
+	 * @param string $action
+	 *
+	 * @return string
 	 */
-	function interwikiTransclude( $title, $action ) {
+	public function interwikiTransclude( $title, $action ) {
 		global $wgEnableScaryTranscluding;
 
 		if ( !$wgEnableScaryTranscluding ) {
-			return wfMsgForContent('scarytranscludedisabled');
+			return wfMessage( 'scarytranscludedisabled' )->inContentLanguage()->text();
 		}
 
-		$url = $title->getFullUrl( "action=$action" );
+		$url = $title->getFullURL( [ 'action' => $action ] );
 
 		if ( strlen( $url ) > 255 ) {
-			return wfMsgForContent( 'scarytranscludetoolong' );
+			return wfMessage( 'scarytranscludetoolong' )->inContentLanguage()->text();
 		}
 		return $this->fetchScaryTemplateMaybeFromCache( $url );
 	}
 
-	function fetchScaryTemplateMaybeFromCache( $url ) {
+	/**
+	 * @param string $url
+	 * @return mixed|string
+	 */
+	public function fetchScaryTemplateMaybeFromCache( $url ) {
 		global $wgTranscludeCacheExpiry;
-		$dbr = wfGetDB( DB_SLAVE );
+		$dbr = wfGetDB( DB_REPLICA );
 		$tsCond = $dbr->timestamp( time() - $wgTranscludeCacheExpiry );
-		$obj = $dbr->selectRow( 'transcache', array('tc_time', 'tc_contents' ),
-				array( 'tc_url' => $url, "tc_time >= " . $dbr->addQuotes( $tsCond ) ) );
+		$obj = $dbr->selectRow( 'transcache', [ 'tc_time', 'tc_contents' ],
+				[ 'tc_url' => $url, "tc_time >= " . $dbr->addQuotes( $tsCond ) ] );
 		if ( $obj ) {
 			return $obj->tc_contents;
 		}
 
-		$text = Http::get( $url );
-		if ( !$text ) {
-			return wfMsgForContent( 'scarytranscludefailed', $url );
+		$req = MWHttpRequest::factory( $url, [], __METHOD__ );
+		$status = $req->execute(); // Status object
+		if ( $status->isOK() ) {
+			$text = $req->getContent();
+		} elseif ( $req->getStatus() != 200 ) {
+			// Though we failed to fetch the content, this status is useless.
+			return wfMessage( 'scarytranscludefailed-httpstatus' )
+				->params( $url, $req->getStatus() /* HTTP status */ )->inContentLanguage()->text();
+		} else {
+			return wfMessage( 'scarytranscludefailed', $url )->inContentLanguage()->text();
 		}
 
 		$dbw = wfGetDB( DB_MASTER );
-		$dbw->replace( 'transcache', array('tc_url'), array(
+		$dbw->replace( 'transcache', [ 'tc_url' ], [
 			'tc_url' => $url,
 			'tc_time' => $dbw->timestamp( time() ),
-			'tc_contents' => $text)
-		);
+			'tc_contents' => $text
+		] );
 		return $text;
 	}
 
-
 	/**
 	 * Triple brace replacement -- used for template arguments
 	 * @private
+	 *
+	 * @param array $piece
+	 * @param PPFrame $frame
+	 *
+	 * @return array
 	 */
-	function argSubstitution( $piece, $frame ) {
-		wfProfileIn( __METHOD__ );
-
+	public function argSubstitution( $piece, $frame ) {
 		$error = false;
 		$parts = $piece['parts'];
 		$nameWithSpaces = $frame->expand( $piece['title'] );
 		$argName = trim( $nameWithSpaces );
 		$object = false;
 		$text = $frame->getArgument( $argName );
-		if (  $text === false && $parts->getLength() > 0
-		  && (
-		    $this->ot['html']
-		    || $this->ot['pre']
-		    || ( $this->ot['wiki'] && $frame->isTemplate() )
-		  )
+		if ( $text === false && $parts->getLength() > 0
+			&& ( $this->ot['html']
+				|| $this->ot['pre']
+				|| ( $this->ot['wiki'] && $frame->isTemplate() )
+			)
 		) {
 			# No match in frame, use the supplied default
 			$object = $parts->item( 0 )->getChildren();
@@ -3420,12 +3785,11 @@ class Parser {
 			$text .= $error;
 		}
 		if ( $object !== false ) {
-			$ret = array( 'object' => $object );
+			$ret = [ 'object' => $object ];
 		} else {
-			$ret = array( 'text' => $text );
+			$ret = [ 'text' => $text ];
 		}
 
-		wfProfileOut( __METHOD__ );
 		return $ret;
 	}
 
@@ -3433,21 +3797,43 @@ class Parser {
 	 * Return the text to be used for a given extension tag.
 	 * This is the ghost of strip().
 	 *
-	 * @param $params Associative array of parameters:
+	 * @param array $params Associative array of parameters:
 	 *     name       PPNode for the tag name
 	 *     attr       PPNode for unparsed text where tag attributes are thought to be
 	 *     attributes Optional associative array of parsed attributes
 	 *     inner      Contents of extension element
 	 *     noClose    Original text did not have a close tag
-	 * @param $frame PPFrame
+	 * @param PPFrame $frame
+	 *
+	 * @throws MWException
+	 * @return string
 	 */
-	function extensionSubstitution( $params, $frame ) {
+	public function extensionSubstitution( $params, $frame ) {
+		static $errorStr = '';
+		static $errorLen = 20;
+
 		$name = $frame->expand( $params['name'] );
+		if ( substr( $name, 0, $errorLen ) === $errorStr ) {
+			// Probably expansion depth or node count exceeded. Just punt the
+			// error up.
+			return $name;
+		}
+
 		$attrText = !isset( $params['attr'] ) ? null : $frame->expand( $params['attr'] );
+		if ( substr( $attrText, 0, $errorLen ) === $errorStr ) {
+			// See above
+			return $attrText;
+		}
+
+		// We can't safely check if the expansion for $content resulted in an
+		// error, because the content could happen to be the error string
+		// (T149622).
 		$content = !isset( $params['inner'] ) ? null : $frame->expand( $params['inner'] );
-		$marker = "{$this->mUniqPrefix}-$name-" . sprintf( '%08X', $this->mMarkerIndex++ ) . self::MARKER_SUFFIX;
 
-		$isFunctionTag = isset( $this->mFunctionTagHooks[strtolower($name)] ) &&
+		$marker = self::MARKER_PREFIX . "-$name-"
+			. sprintf( '%08X', $this->mMarkerIndex++ ) . self::MARKER_SUFFIX;
+
+		$isFunctionTag = isset( $this->mFunctionTagHooks[strtolower( $name )] ) &&
 			( $this->ot['html'] || $this->ot['pre'] );
 		if ( $isFunctionTag ) {
 			$markerType = 'none';
@@ -3462,19 +3848,14 @@ class Parser {
 			}
 
 			if ( isset( $this->mTagHooks[$name] ) ) {
-				# Workaround for PHP bug 35229 and similar
-				if ( !is_callable( $this->mTagHooks[$name] ) ) {
-					throw new MWException( "Tag hook for $name is not callable\n" );
-				}
 				$output = call_user_func_array( $this->mTagHooks[$name],
-					array( $content, $attributes, $this, $frame ) );
+					[ $content, $attributes, $this, $frame ] );
 			} elseif ( isset( $this->mFunctionTagHooks[$name] ) ) {
-				list( $callback, $flags ) = $this->mFunctionTagHooks[$name];
-				if ( !is_callable( $callback ) ) {
-					throw new MWException( "Tag hook for $name is not callable\n" );
-				}
+				list( $callback, ) = $this->mFunctionTagHooks[$name];
 
-				$output = call_user_func_array( $callback, array( &$this, $frame, $content, $attributes ) );
+				// Avoid PHP 7.1 warning from passing $this by reference
+				$parser = $this;
+				$output = call_user_func_array( $callback, [ &$parser, $frame, $content, $attributes ] );
 			} else {
 				$output = 'Invalid tag extension name: ' .
 					htmlspecialchars( $name ) . '';
@@ -3501,6 +3882,10 @@ class Parser {
 				$output = "<$name$attrText/>";
 			} else {
 				$close = is_null( $params['close'] ) ? '' : $frame->expand( $params['close'] );
+				if ( substr( $close, 0, $errorLen ) === $errorStr ) {
+					// See above
+					return $close;
+				}
 				$output = "<$name$attrText>$content$close";
 			}
 		}
@@ -3508,11 +3893,11 @@ class Parser {
 		if ( $markerType === 'none' ) {
 			return $output;
 		} elseif ( $markerType === 'nowiki' ) {
-			$this->mStripState->nowiki->setPair( $marker, $output );
+			$this->mStripState->addNoWiki( $marker, $output );
 		} elseif ( $markerType === 'general' ) {
-			$this->mStripState->general->setPair( $marker, $output );
+			$this->mStripState->addGeneral( $marker, $output );
 		} else {
-			throw new MWException( __METHOD__.': invalid marker type' );
+			throw new MWException( __METHOD__ . ': invalid marker type' );
 		}
 		return $marker;
 	}
@@ -3520,12 +3905,12 @@ class Parser {
 	/**
 	 * Increment an include size counter
 	 *
-	 * @param $type String: the type of expansion
-	 * @param $size Integer: the size of the text
-	 * @return Boolean: false if this inclusion would take it over the maximum, true otherwise
+	 * @param string $type The type of expansion
+	 * @param int $size The size of the text
+	 * @return bool False if this inclusion would take it over the maximum, true otherwise
 	 */
-	function incrementIncludeSize( $type, $size ) {
-		if ( $this->mIncludeSizes[$type] + $size > $this->mOptions->getMaxIncludeSize( $type ) ) {
+	public function incrementIncludeSize( $type, $size ) {
+		if ( $this->mIncludeSizes[$type] + $size > $this->mOptions->getMaxIncludeSize() ) {
 			return false;
 		} else {
 			$this->mIncludeSizes[$type] += $size;
@@ -3536,24 +3921,22 @@ class Parser {
 	/**
 	 * Increment the expensive function count
 	 *
-	 * @return Boolean: false if the limit has been exceeded
+	 * @return bool False if the limit has been exceeded
 	 */
-	function incrementExpensiveFunctionCount() {
-		global $wgExpensiveParserFunctionLimit;
+	public function incrementExpensiveFunctionCount() {
 		$this->mExpensiveFunctionCount++;
-		if ( $this->mExpensiveFunctionCount <= $wgExpensiveParserFunctionLimit ) {
-			return true;
-		}
-		return false;
+		return $this->mExpensiveFunctionCount <= $this->mOptions->getExpensiveParserFunctionLimit();
 	}
 
 	/**
 	 * Strip double-underscore items like __NOGALLERY__ and __NOTOC__
 	 * Fills $this->mDoubleUnderscores, returns the modified text
+	 *
+	 * @param string $text
+	 *
+	 * @return string
 	 */
-	function doDoubleUnderscore( $text ) {
-		wfProfileIn( __METHOD__ );
-
+	public function doDoubleUnderscore( $text ) {
 		# The position of __TOC__ needs to be recorded
 		$mw = MagicWord::get( 'toc' );
 		if ( $mw->match( $text ) ) {
@@ -3577,13 +3960,13 @@ class Parser {
 		if ( isset( $this->mDoubleUnderscores['notoc'] ) && !$this->mForceTocPosition ) {
 			$this->mShowToc = false;
 		}
-		if ( isset( $this->mDoubleUnderscores['hiddencat'] ) && $this->mTitle->getNamespace() == NS_CATEGORY ) {
+		if ( isset( $this->mDoubleUnderscores['hiddencat'] )
+			&& $this->mTitle->getNamespace() == NS_CATEGORY
+		) {
 			$this->addTrackingCategory( 'hidden-category-category' );
 		}
-		# (bug 8068) Allow control over whether robots index a page.
-		#
-		# FIXME (bug 14899): __INDEX__ always overrides __NOINDEX__ here!  This
-		# is not desirable, the last one on the page should win.
+		# (T10068) Allow control over whether robots index a page.
+		# __INDEX__ always overrides __NOINDEX__, see T16899
 		if ( isset( $this->mDoubleUnderscores['noindex'] ) && $this->mTitle->canUseNoindex() ) {
 			$this->mOutput->setIndexPolicy( 'noindex' );
 			$this->addTrackingCategory( 'noindex-category' );
@@ -3592,39 +3975,22 @@ class Parser {
 			$this->mOutput->setIndexPolicy( 'index' );
 			$this->addTrackingCategory( 'index-category' );
 		}
-		
+
 		# Cache all double underscores in the database
 		foreach ( $this->mDoubleUnderscores as $key => $val ) {
 			$this->mOutput->setProperty( $key, '' );
 		}
 
-		wfProfileOut( __METHOD__ );
 		return $text;
 	}
 
 	/**
-	 * Add a tracking category, getting the title from a system message,
-	 * or print a debug message if the title is invalid.
-	 *
-	 * @param $msg String: message key
-	 * @return Boolean: whether the addition was successful
+	 * @see ParserOutput::addTrackingCategory()
+	 * @param string $msg Message key
+	 * @return bool Whether the addition was successful
 	 */
-	protected function addTrackingCategory( $msg ) {
-		$cat = wfMsgForContent( $msg );
-
-		# Allow tracking categories to be disabled by setting them to "-"
-		if ( $cat === '-' ) {
-			return false;
-		}
-
-		$containerCategory = Title::makeTitleSafe( NS_CATEGORY, $cat );
-		if ( $containerCategory ) {
-			$this->mOutput->addCategory( $containerCategory->getDBkey(), $this->getDefaultSort() );
-			return true;
-		} else {
-			wfDebug( __METHOD__.": [[MediaWiki:$msg]] is not a valid title!\n" );
-			return false;
-		}
+	public function addTrackingCategory( $msg ) {
+		return $this->mOutput->addTrackingCategory( $msg, $this->mTitle );
 	}
 
 	/**
@@ -3637,27 +4003,34 @@ class Parser {
 	 * It loops through all headlines, collects the necessary data, then splits up the
 	 * string and re-inserts the newly formatted headlines.
 	 *
-	 * @param $text String
-	 * @param $origText String: original, untouched wikitext
-	 * @param $isMain Boolean
+	 * @param string $text
+	 * @param string $origText Original, untouched wikitext
+	 * @param bool $isMain
+	 * @return mixed|string
 	 * @private
 	 */
-	function formatHeadings( $text, $origText, $isMain=true ) {
-		global $wgMaxTocLevel, $wgContLang, $wgHtml5, $wgExperimentalHtmlIds;
+	public function formatHeadings( $text, $origText, $isMain = true ) {
+		global $wgMaxTocLevel;
 
-		$doNumberHeadings = $this->mOptions->getNumberHeadings();
-		
 		# Inhibit editsection links if requested in the page
 		if ( isset( $this->mDoubleUnderscores['noeditsection'] ) ) {
-			$showEditLink = 0;
+			$maybeShowEditLink = $showEditLink = false;
 		} else {
+			$maybeShowEditLink = true; /* Actual presence will depend on ParserOptions option */
 			$showEditLink = $this->mOptions->getEditSection();
 		}
+		if ( $showEditLink ) {
+			$this->mOutput->setEditSectionTokens( true );
+		}
 
 		# Get all headlines for numbering them and adding funky stuff like [edit]
 		# links - this is for later, but we need the number of headlines right now
-		$matches = array();
-		$numMatches = preg_match_all( '/[1-6])(?P.*?'.'>)(?P
.*?)<\/H[1-6] *>/i', $text, $matches );
+		$matches = [];
+		$numMatches = preg_match_all(
+			'/[1-6])(?P.*?>)\s*(?P
[\s\S]*?)\s*<\/H[1-6] *>/i',
+			$text,
+			$matches
+		);
 
 		# if there are fewer than 4 headlines in the article, do not show TOC
 		# unless it's been explicitly enabled.
@@ -3683,9 +4056,6 @@ class Parser {
 			$enoughToc = true;
 		}
 
-		# We need this to perform operations on the HTML
-		$sk = $this->mOptions->getSkin( $this->mTitle );
-
 		# headline counter
 		$headlineCount = 0;
 		$numVisible = 0;
@@ -3694,14 +4064,14 @@ class Parser {
 		# passed to the skin functions. These are determined here
 		$toc = '';
 		$full = '';
-		$head = array();
-		$sublevelCount = array();
-		$levelCount = array();
+		$head = [];
+		$sublevelCount = [];
+		$levelCount = [];
 		$level = 0;
 		$prevlevel = 0;
 		$toclevel = 0;
 		$prevtoclevel = 0;
-		$markerRegex = "{$this->mUniqPrefix}-h-(\d+)-" . self::MARKER_SUFFIX;
+		$markerRegex = self::MARKER_PREFIX . "-h-(\d+)-" . self::MARKER_SUFFIX;
 		$baseTitleText = $this->mTitle->getPrefixedDBkey();
 		$oldType = $this->mOutputType;
 		$this->setOutputType( self::OT_WIKI );
@@ -3709,20 +4079,22 @@ class Parser {
 		$root = $this->preprocessToDom( $origText );
 		$node = $root->getFirstChild();
 		$byteOffset = 0;
-		$tocraw = array();
-		$refers = array();
+		$tocraw = [];
+		$refers = [];
+
+		$headlines = $numMatches !== false ? $matches[3] : [];
 
-		foreach ( $matches[3] as $headline ) {
+		foreach ( $headlines as $headline ) {
 			$isTemplate = false;
 			$titleText = false;
 			$sectionIndex = false;
 			$numbering = '';
-			$markerMatches = array();
-			if ( preg_match("/^$markerRegex/", $headline, $markerMatches ) ) {
+			$markerMatches = [];
+			if ( preg_match( "/^$markerRegex/", $headline, $markerMatches ) ) {
 				$serial = $markerMatches[1];
 				list( $titleText, $sectionIndex ) = $this->mHeadings[$serial];
 				$isTemplate = ( $titleText != $baseTitleText );
-				$headline = preg_replace( "/^$markerRegex/", "", $headline );
+				$headline = preg_replace( "/^$markerRegex\\s*/", "", $headline );
 			}
 
 			if ( $toclevel ) {
@@ -3734,9 +4106,9 @@ class Parser {
 				# Increase TOC level
 				$toclevel++;
 				$sublevelCount[$toclevel] = 0;
-				if ( $toclevel<$wgMaxTocLevel ) {
+				if ( $toclevel < $wgMaxTocLevel ) {
 					$prevtoclevel = $toclevel;
-					$toc .= $sk->tocIndent();
+					$toc .= Linker::tocIndent();
 					$numVisible++;
 				}
 			} elseif ( $level < $prevlevel && $toclevel > 1 ) {
@@ -3756,133 +4128,143 @@ class Parser {
 				if ( $i == 0 ) {
 					$toclevel = 1;
 				}
-				if ( $toclevel<$wgMaxTocLevel ) {
+				if ( $toclevel < $wgMaxTocLevel ) {
 					if ( $prevtoclevel < $wgMaxTocLevel ) {
 						# Unindent only if the previous toc level was shown :p
-						$toc .= $sk->tocUnindent( $prevtoclevel - $toclevel );
+						$toc .= Linker::tocUnindent( $prevtoclevel - $toclevel );
 						$prevtoclevel = $toclevel;
 					} else {
-						$toc .= $sk->tocLineEnd();
+						$toc .= Linker::tocLineEnd();
 					}
 				}
 			} else {
 				# No change in level, end TOC line
-				if ( $toclevel<$wgMaxTocLevel ) {
-					$toc .= $sk->tocLineEnd();
+				if ( $toclevel < $wgMaxTocLevel ) {
+					$toc .= Linker::tocLineEnd();
 				}
 			}
 
 			$levelCount[$toclevel] = $level;
 
 			# count number of headlines for each level
-			@$sublevelCount[$toclevel]++;
+			$sublevelCount[$toclevel]++;
 			$dot = 0;
-			for( $i = 1; $i <= $toclevel; $i++ ) {
+			for ( $i = 1; $i <= $toclevel; $i++ ) {
 				if ( !empty( $sublevelCount[$i] ) ) {
 					if ( $dot ) {
 						$numbering .= '.';
 					}
-					$numbering .= $wgContLang->formatNum( $sublevelCount[$i] );
+					$numbering .= $this->getTargetLanguage()->formatNum( $sublevelCount[$i] );
 					$dot = 1;
 				}
 			}
 
 			# The safe header is a version of the header text safe to use for links
-			# Avoid insertion of weird stuff like  by expanding the relevant sections
-			$safeHeadline = $this->mStripState->unstripBoth( $headline );
 
 			# Remove link placeholders by the link text.
 			#     
 			# turns into
 			#     link text with suffix
-			$safeHeadline = $this->replaceLinkHoldersText( $safeHeadline );
+			# Do this before unstrip since link text can contain strip markers
+			$safeHeadline = $this->replaceLinkHoldersText( $headline );
 
-			# Strip out HTML (other than plain  and : bug 8393)
+			# Avoid insertion of weird stuff like  by expanding the relevant sections
+			$safeHeadline = $this->mStripState->unstripBoth( $safeHeadline );
+
+			# Strip out HTML (first regex removes any tag not allowed)
+			# Allowed tags are:
+			# *  and  (T10393)
+			# *  (T28375)
+			# *  (r105284)
+			# *  (T74884)
+			# *  and  (T37167)
+			# *  and  (T35715)
+			# We strip any parameter from accepted tags (second regex), except dir="rtl|ltr" from ,
+			# to allow setting directionality in toc items.
 			$tocline = preg_replace(
-				array( '#<(?!/?(sup|sub)).*?'.'>#', '#<(/?(sup|sub)).*?'.'>#' ),
-				array( '',                          '<$1>' ),
+				[
+					'#<(?!/?(span|sup|sub|bdi|i|b|s|strike)(?: [^>]*)?>).*?>#',
+					'#<(/?(?:span(?: dir="(?:rtl|ltr)")?|sup|sub|bdi|i|b|s|strike))(?: .*?)?>#'
+				],
+				[ '', '<$1>' ],
 				$safeHeadline
 			);
+
+			# Strip '', which is the result from the above if
+			#  is used to produce an additional anchor
+			# for a section.
+			$tocline = str_replace( '', '', $tocline );
+
 			$tocline = trim( $tocline );
 
 			# For the anchor, strip out HTML-y stuff period
-			$safeHeadline = preg_replace( '/<.*?'.'>/', '', $safeHeadline );
+			$safeHeadline = preg_replace( '/<.*?>/', '', $safeHeadline );
 			$safeHeadline = Sanitizer::normalizeSectionNameWhitespace( $safeHeadline );
 
 			# Save headline for section edit hint before it's escaped
 			$headlineHint = $safeHeadline;
 
-			if ( $wgHtml5 && $wgExperimentalHtmlIds ) {
-				# For reverse compatibility, provide an id that's
-				# HTML4-compatible, like we used to.
-				#
-				# It may be worth noting, academically, that it's possible for
-				# the legacy anchor to conflict with a non-legacy headline
-				# anchor on the page.  In this case likely the "correct" thing
-				# would be to either drop the legacy anchors or make sure
-				# they're numbered first.  However, this would require people
-				# to type in section names like "abc_.D7.93.D7.90.D7.A4"
-				# manually, so let's not bother worrying about it.
-				$legacyHeadline = Sanitizer::escapeId( $safeHeadline,
-					array( 'noninitial', 'legacy' ) );
-				$safeHeadline = Sanitizer::escapeId( $safeHeadline );
-
-				if ( $legacyHeadline == $safeHeadline ) {
-					# No reason to have both (in fact, we can't)
-					$legacyHeadline = false;
-				}
-			} else {
-				$legacyHeadline = false;
-				$safeHeadline = Sanitizer::escapeId( $safeHeadline,
-					'noninitial' );
+			# Decode HTML entities
+			$safeHeadline = Sanitizer::decodeCharReferences( $safeHeadline );
+			$fallbackHeadline = Sanitizer::escapeIdForAttribute( $safeHeadline, Sanitizer::ID_FALLBACK );
+			$linkAnchor = Sanitizer::escapeIdForLink( $safeHeadline );
+			$safeHeadline = Sanitizer::escapeIdForAttribute( $safeHeadline, Sanitizer::ID_PRIMARY );
+			if ( $fallbackHeadline === $safeHeadline ) {
+				# No reason to have both (in fact, we can't)
+				$fallbackHeadline = false;
 			}
 
-			# HTML names must be case-insensitively unique (bug 10721). 
-			# This does not apply to Unicode characters per 
-			# http://dev.w3.org/html5/spec/infrastructure.html#case-sensitivity-and-string-comparison
-			# FIXME: We may be changing them depending on the current locale.
+			# HTML IDs must be case-insensitively unique for IE compatibility (T12721).
+			# @todo FIXME: We may be changing them depending on the current locale.
 			$arrayKey = strtolower( $safeHeadline );
-			if ( $legacyHeadline === false ) {
-				$legacyArrayKey = false;
+			if ( $fallbackHeadline === false ) {
+				$fallbackArrayKey = false;
 			} else {
-				$legacyArrayKey = strtolower( $legacyHeadline );
+				$fallbackArrayKey = strtolower( $fallbackHeadline );
 			}
 
-			# count how many in assoc. array so we can track dupes in anchors
+			# Create the anchor for linking from the TOC to the section
+			$anchor = $safeHeadline;
+			$fallbackAnchor = $fallbackHeadline;
 			if ( isset( $refers[$arrayKey] ) ) {
-				$refers[$arrayKey]++;
+				// @codingStandardsIgnoreStart
+				for ( $i = 2; isset( $refers["${arrayKey}_$i"] ); ++$i );
+				// @codingStandardsIgnoreEnd
+				$anchor .= "_$i";
+				$linkAnchor .= "_$i";
+				$refers["${arrayKey}_$i"] = true;
 			} else {
-				$refers[$arrayKey] = 1;
+				$refers[$arrayKey] = true;
 			}
-			if ( isset( $refers[$legacyArrayKey] ) ) {
-				$refers[$legacyArrayKey]++;
+			if ( $fallbackHeadline !== false && isset( $refers[$fallbackArrayKey] ) ) {
+				// @codingStandardsIgnoreStart
+				for ( $i = 2; isset( $refers["${fallbackArrayKey}_$i"] ); ++$i );
+				// @codingStandardsIgnoreEnd
+				$fallbackAnchor .= "_$i";
+				$refers["${fallbackArrayKey}_$i"] = true;
 			} else {
-				$refers[$legacyArrayKey] = 1;
+				$refers[$fallbackArrayKey] = true;
 			}
 
 			# Don't number the heading if it is the only one (looks silly)
-			if ( $doNumberHeadings && count( $matches[3] ) > 1) {
+			if ( count( $matches[3] ) > 1 && $this->mOptions->getNumberHeadings() ) {
 				# the two are different if the line contains a link
-				$headline = $numbering . ' ' . $headline;
+				$headline = Html::element(
+					'span',
+					[ 'class' => 'mw-headline-number' ],
+					$numbering
+				) . ' ' . $headline;
 			}
 
-			# Create the anchor for linking from the TOC to the section
-			$anchor = $safeHeadline;
-			$legacyAnchor = $legacyHeadline;
-			if ( $refers[$arrayKey] > 1 ) {
-				$anchor .= '_' . $refers[$arrayKey];
-			}
-			if ( $legacyHeadline !== false && $refers[$legacyArrayKey] > 1 ) {
-				$legacyAnchor .= '_' . $refers[$legacyArrayKey];
-			}
 			if ( $enoughToc && ( !isset( $wgMaxTocLevel ) || $toclevel < $wgMaxTocLevel ) ) {
-				$toc .= $sk->tocLine( $anchor, $tocline,
+				$toc .= Linker::tocLine( $linkAnchor, $tocline,
 					$numbering, $toclevel, ( $isTemplate ? false : $sectionIndex ) );
 			}
 
 			# Add the section to the section tree
 			# Find the DOM node for this header
-			while ( $node && !$isTemplate ) {
+			$noOffset = ( $isTemplate || $sectionIndex === false );
+			while ( $node && !$noOffset ) {
 				if ( $node->getName() === 'h' ) {
 					$bits = $node->splitHeading();
 					if ( $bits['i'] == $sectionIndex ) {
@@ -3893,32 +4275,56 @@ class Parser {
 					$frame->expand( $node, PPFrame::RECOVER_ORIG ) ) );
 				$node = $node->getNextSibling();
 			}
-			$tocraw[] = array(
+			$tocraw[] = [
 				'toclevel' => $toclevel,
 				'level' => $level,
 				'line' => $tocline,
 				'number' => $numbering,
 				'index' => ( $isTemplate ? 'T-' : '' ) . $sectionIndex,
 				'fromtitle' => $titleText,
-				'byteoffset' => ( $isTemplate ? null : $byteOffset ),
+				'byteoffset' => ( $noOffset ? null : $byteOffset ),
 				'anchor' => $anchor,
-			);
+			];
 
 			# give headline the correct  tag
-			if ( $showEditLink && $sectionIndex !== false ) {
+			if ( $maybeShowEditLink && $sectionIndex !== false ) {
+				// Output edit section links as markers with styles that can be customized by skins
 				if ( $isTemplate ) {
 					# Put a T flag in the section identifier, to indicate to extractSections()
 					# that sections inside  should be counted.
-					$editlink = $sk->doEditSectionLink( Title::newFromText( $titleText ), "T-$sectionIndex", null, $this->mOptions->getUserLang() );
+					$editsectionPage = $titleText;
+					$editsectionSection = "T-$sectionIndex";
+					$editsectionContent = null;
+				} else {
+					$editsectionPage = $this->mTitle->getPrefixedText();
+					$editsectionSection = $sectionIndex;
+					$editsectionContent = $headlineHint;
+				}
+				// We use a bit of pesudo-xml for editsection markers. The
+				// language converter is run later on. Using a UNIQ style marker
+				// leads to the converter screwing up the tokens when it
+				// converts stuff. And trying to insert strip tags fails too. At
+				// this point all real inputted tags have already been escaped,
+				// so we don't have to worry about a user trying to input one of
+				// these markers directly. We use a page and section attribute
+				// to stop the language converter from converting these
+				// important bits of data, but put the headline hint inside a
+				// content block because the language converter is supposed to
+				// be able to convert that piece of data.
+				// Gets replaced with html in ParserOutput::getText
+				$editlink = '';
 				} else {
-					$editlink = $sk->doEditSectionLink( $this->mTitle, $sectionIndex, $headlineHint, $this->mOptions->getUserLang() );
+					$editlink .= '/>';
 				}
 			} else {
 				$editlink = '';
 			}
-			$head[$headlineCount] = $sk->makeHeadline( $level,
+			$head[$headlineCount] = Linker::makeHeadline( $level,
 				$matches['attrib'][$headlineCount], $anchor, $headline,
-				$editlink, $legacyAnchor );
+				$editlink, $fallbackAnchor );
 
 			$headlineCount++;
 		}
@@ -3932,10 +4338,11 @@ class Parser {
 
 		if ( $enoughToc ) {
 			if ( $prevtoclevel > 0 && $prevtoclevel < $wgMaxTocLevel ) {
-				$toc .= $sk->tocUnindent( $prevtoclevel - 1 );
+				$toc .= Linker::tocUnindent( $prevtoclevel - 1 );
 			}
-			$toc = $sk->tocList( $toc, $this->mOptions->getUserLang() );
+			$toc = Linker::tocList( $toc, $this->mOptions->getUserLangObj() );
 			$this->mOutput->setTOCHTML( $toc );
+			$toc = self::TOC_START . $toc . self::TOC_END;
 		}
 
 		if ( $isMain ) {
@@ -3943,30 +4350,42 @@ class Parser {
 		}
 
 		# split up and insert constructed headlines
-
-		$blocks = preg_split( '/.*?<\/H[1-6]>/i', $text );
+		$blocks = preg_split( '/[\s\S]*?<\/H[1-6]>/i', $text );
 		$i = 0;
 
+		// build an array of document sections
+		$sections = [];
 		foreach ( $blocks as $block ) {
-			if ( $showEditLink && $headlineCount > 0 && $i == 0 && $block !== "\n" ) {
-				# This is the [edit] link that appears for the top block of text when
-				# section editing is enabled
-
-				# Disabled because it broke block formatting
-				# For example, a bullet point in the top line
-				# $full .= $sk->editSectionLink(0);
-			}
-			$full .= $block;
-			if ( $enoughToc && !$i && $isMain && !$this->mForceTocPosition ) {
-				# Top anchor now in skin
-				$full = $full.$toc;
+			// $head is zero-based, sections aren't.
+			if ( empty( $head[$i - 1] ) ) {
+				$sections[$i] = $block;
+			} else {
+				$sections[$i] = $head[$i - 1] . $block;
 			}
 
-			if ( !empty( $head[$i] ) ) {
-				$full .= $head[$i];
-			}
+			/**
+			 * Send a hook, one per section.
+			 * The idea here is to be able to make section-level DIVs, but to do so in a
+			 * lower-impact, more correct way than r50769
+			 *
+			 * $this : caller
+			 * $section : the section number
+			 * &$sectionContent : ref to the content of the section
+			 * $showEditLinks : boolean describing whether this section has an edit link
+			 */
+			Hooks::run( 'ParserSectionCreate', [ $this, $i, &$sections[$i], $showEditLink ] );
+
 			$i++;
 		}
+
+		if ( $enoughToc && $isMain && !$this->mForceTocPosition ) {
+			// append the TOC at the beginning
+			// Top anchor now in skin
+			$sections[0] = $sections[0] . $toc . "\n";
+		}
+
+		$full .= implode( '', $sections );
+
 		if ( $this->mForceTocPosition ) {
 			return str_replace( '', $toc, $full );
 		} else {
@@ -3975,69 +4394,63 @@ class Parser {
 	}
 
 	/**
-	 * Transform wiki markup when saving a page by doing \r\n -> \n
-	 * conversion, substitting signatures, {{subst:}} templates, etc.
+	 * Transform wiki markup when saving a page by doing "\r\n" -> "\n"
+	 * conversion, substituting signatures, {{subst:}} templates, etc.
 	 *
-	 * @param $text String: the text to transform
-	 * @param $title Title: the Title object for the current article
-	 * @param $user User: the User object describing the current user
-	 * @param $options ParserOptions: parsing options
-	 * @param $clearState Boolean: whether to clear the parser state first
-	 * @return String: the altered wiki markup
+	 * @param string $text The text to transform
+	 * @param Title $title The Title object for the current article
+	 * @param User $user The User object describing the current user
+	 * @param ParserOptions $options Parsing options
+	 * @param bool $clearState Whether to clear the parser state first
+	 * @return string The altered wiki markup
 	 */
-	public function preSaveTransform( $text, Title $title, $user, $options, $clearState = true ) {
-		$this->mOptions = $options;
-		$this->setTitle( $title );
-		$this->setOutputType( self::OT_WIKI );
-
+	public function preSaveTransform( $text, Title $title, User $user,
+		ParserOptions $options, $clearState = true
+	) {
 		if ( $clearState ) {
-			$this->clearState();
+			$magicScopeVariable = $this->lock();
 		}
+		$this->startParse( $title, $options, self::OT_WIKI, $clearState );
+		$this->setUser( $user );
 
-		$pairs = array(
-			"\r\n" => "\n",
-		);
-		$text = str_replace( array_keys( $pairs ), array_values( $pairs ), $text );
-		$text = $this->pstPass2( $text, $user );
+		// Strip U+0000 NULL (T159174)
+		$text = str_replace( "\000", '', $text );
+
+		// We still normalize line endings for backwards-compatibility
+		// with other code that just calls PST, but this should already
+		// be handled in TextContent subclasses
+		$text = TextContent::normalizeLineEndings( $text );
+
+		if ( $options->getPreSaveTransform() ) {
+			$text = $this->pstPass2( $text, $user );
+		}
 		$text = $this->mStripState->unstripBoth( $text );
+
+		$this->setUser( null ); # Reset
+
 		return $text;
 	}
 
 	/**
 	 * Pre-save transform helper function
-	 * @private
+	 *
+	 * @param string $text
+	 * @param User $user
+	 *
+	 * @return string
 	 */
-	function pstPass2( $text, $user ) {
-		global $wgContLang, $wgLocaltimezone;
+	private function pstPass2( $text, $user ) {
+		global $wgContLang;
 
 		# Note: This is the timestamp saved as hardcoded wikitext to
 		# the database, we use $wgContLang here in order to give
 		# everyone the same signature and use the default one rather
 		# than the one selected in each user's preferences.
-		# (see also bug 12815)
+		# (see also T14815)
 		$ts = $this->mOptions->getTimestamp();
-		if ( isset( $wgLocaltimezone ) ) {
-			$tz = $wgLocaltimezone;
-		} else {
-			$tz = date_default_timezone_get();
-		}
-
-		$unixts = wfTimestamp( TS_UNIX, $ts );
-		$oldtz = date_default_timezone_get();
-		date_default_timezone_set( $tz );
-		$ts = date( 'YmdHis', $unixts );
-		$tzMsg = date( 'T', $unixts );  # might vary on DST changeover!
-
-		# Allow translation of timezones through wiki. date() can return
-		# whatever crap the system uses, localised or not, so we cannot
-		# ship premade translations.
-		$key = 'timezone-' . strtolower( trim( $tzMsg ) );
-		$value = wfMsgForContent( $key );
-		if ( !wfEmptyMsg( $key, $value ) ) {
-			$tzMsg = $value;
-		}
-
-		date_default_timezone_set( $oldtz );
+		$timestamp = MWTimestamp::getLocalInstance( $ts );
+		$ts = $timestamp->format( 'YmdHis' );
+		$tzMsg = $timestamp->getTimezoneMessage()->inContentLanguage()->text();
 
 		$d = $wgContLang->timeanddate( $ts, false, false ) . " ($tzMsg)";
 
@@ -4046,25 +4459,32 @@ class Parser {
 		$text = $this->replaceVariables( $text );
 
 		# This works almost by chance, as the replaceVariables are done before the getUserSig(),
-		# which may corrupt this parser instance via its wfMsgExt( parsemag ) call-
+		# which may corrupt this parser instance via its wfMessage()->text() call-
 
 		# Signatures
-		$sigText = $this->getUserSig( $user );
-		$text = strtr( $text, array(
-			'~~~~~' => $d,
-			'~~~~' => "$sigText $d",
-			'~~~' => $sigText
-		) );
-
-		# Context links: [[|name]] and [[name (context)|]]
-		global $wgLegalTitleChars;
-		$tc = "[$wgLegalTitleChars]";
+		if ( strpos( $text, '~~~' ) !== false ) {
+			$sigText = $this->getUserSig( $user );
+			$text = strtr( $text, [
+				'~~~~~' => $d,
+				'~~~~' => "$sigText $d",
+				'~~~' => $sigText
+			] );
+			# The main two signature forms used above are time-sensitive
+			$this->mOutput->setFlag( 'user-signature' );
+		}
+
+		# Context links ("pipe tricks"): [[|name]] and [[name (context)|]]
+		$tc = '[' . Title::legalChars() . ']';
 		$nc = '[ _0-9A-Za-z\x80-\xff-]'; # Namespaces can use non-ascii!
 
-		$p1 = "/\[\[(:?$nc+:|:|)($tc+?)( \\($tc+\\))\\|]]/";		# [[ns:page (context)|]]
-		$p4 = "/\[\[(:?$nc+:|:|)($tc+?)(（$tc+）)\\|]]/";		# [[ns:page（context）|]]
-		$p3 = "/\[\[(:?$nc+:|:|)($tc+?)( \\($tc+\\)|)(, $tc+|)\\|]]/";	# [[ns:page (context), context|]]
-		$p2 = "/\[\[\\|($tc+)]]/";					# [[|page]]
+		// [[ns:page (context)|]]
+		$p1 = "/\[\[(:?$nc+:|:|)($tc+?)( ?\\($tc+\\))\\|]]/";
+		// [[ns:page（context）|]] (double-width brackets, added in r40257)
+		$p4 = "/\[\[(:?$nc+:|:|)($tc+?)( ?（$tc+）)\\|]]/";
+		// [[ns:page (context), context|]] (using either single or double-width comma)
+		$p3 = "/\[\[(:?$nc+:|:|)($tc+?)( ?\\($tc+\\)|)((?:, |，)$tc+|)\\|]]/";
+		// [[|page]] (reverse pipe trick: add context from page title)
+		$p2 = "/\[\[\\|($tc+)]]/";
 
 		# try $p1 first, to turn "[[A, B (C)|]]" into "[[A, B (C)|A, B]]"
 		$text = preg_replace( $p1, '[[\\1\\2\\3|\\2]]', $text );
@@ -4072,7 +4492,7 @@ class Parser {
 		$text = preg_replace( $p3, '[[\\1\\2\\3\\4|\\2]]', $text );
 
 		$t = $this->mTitle->getText();
-		$m = array();
+		$m = [];
 		if ( preg_match( "/^($nc+:|)$tc+?( \\($tc+\\))$/", $t, $m ) ) {
 			$text = preg_replace( $p2, "[[$m[1]\\1$m[2]|\\1]]", $text );
 		} elseif ( preg_match( "/^($nc+:|)$tc+?(, $tc+|)$/", $t, $m ) && "$m[1]$m[2]" != '' ) {
@@ -4082,9 +4502,6 @@ class Parser {
 			$text = preg_replace( $p2, '[[\\1]]', $text );
 		}
 
-		# Trim trailing whitespace
-		$text = rtrim( $text );
-
 		return $text;
 	}
 
@@ -4093,21 +4510,24 @@ class Parser {
 	 * validated, ready-to-insert wikitext.
 	 * If you have pre-fetched the nickname or the fancySig option, you can
 	 * specify them here to save a database query.
+	 * Do not reuse this parser instance after calling getUserSig(),
+	 * as it may have changed if it's the $wgParser.
 	 *
-	 * @param $user User
-	 * @param $nickname String: nickname to use or false to use user's default nickname
-	 * @param $fancySig Boolean: whether the nicknname is the complete signature
-	 *                  or null to use default value
+	 * @param User &$user
+	 * @param string|bool $nickname Nickname to use or false to use user's default nickname
+	 * @param bool|null $fancySig whether the nicknname is the complete signature
+	 *    or null to use default value
 	 * @return string
 	 */
-	function getUserSig( &$user, $nickname = false, $fancySig = null ) {
+	public function getUserSig( &$user, $nickname = false, $fancySig = null ) {
 		global $wgMaxSigChars;
 
 		$username = $user->getName();
 
 		# If not given, retrieve from the user object.
-		if ( $nickname === false )
+		if ( $nickname === false ) {
 			$nickname = $user->getOption( 'nickname' );
+		}
 
 		if ( is_null( $fancySig ) ) {
 			$fancySig = $user->getBoolOption( 'fancysig' );
@@ -4126,50 +4546,47 @@ class Parser {
 			} else {
 				# Failed to validate; fall back to the default
 				$nickname = $username;
-				wfDebug( __METHOD__.": $username has bad XML tags in signature.\n" );
+				wfDebug( __METHOD__ . ": $username has bad XML tags in signature.\n" );
 			}
 		}
 
 		# Make sure nickname doesnt get a sig in a sig
-		$nickname = $this->cleanSigInSig( $nickname );
+		$nickname = self::cleanSigInSig( $nickname );
 
 		# If we're still here, make it a link to the user page
 		$userText = wfEscapeWikiText( $username );
 		$nickText = wfEscapeWikiText( $nickname );
-		if ( $user->isAnon() )  {
-			return wfMsgExt( 'signature-anon', array( 'content', 'parsemag' ), $userText, $nickText );
-		} else {
-			return wfMsgExt( 'signature', array( 'content', 'parsemag' ), $userText, $nickText );
-		}
+		$msgName = $user->isAnon() ? 'signature-anon' : 'signature';
+
+		return wfMessage( $msgName, $userText, $nickText )->inContentLanguage()
+			->title( $this->getTitle() )->text();
 	}
 
 	/**
 	 * Check that the user's signature contains no bad XML
 	 *
-	 * @param $text String
-	 * @return mixed An expanded string, or false if invalid.
+	 * @param string $text
+	 * @return string|bool An expanded string, or false if invalid.
 	 */
-	function validateSig( $text ) {
-		return( Xml::isWellFormedXmlFragment( $text ) ? $text : false );
+	public function validateSig( $text ) {
+		return Xml::isWellFormedXmlFragment( $text ) ? $text : false;
 	}
 
 	/**
 	 * Clean up signature text
 	 *
-	 * 1) Strip ~~~, ~~~~ and ~~~~~ out of signatures @see cleanSigInSig
+	 * 1) Strip 3, 4 or 5 tildes out of signatures @see cleanSigInSig
 	 * 2) Substitute all transclusions
 	 *
-	 * @param $text String
-	 * @param $parsing Whether we're cleaning (preferences save) or parsing
-	 * @return String: signature text
+	 * @param string $text
+	 * @param bool $parsing Whether we're cleaning (preferences save) or parsing
+	 * @return string Signature text
 	 */
-	function cleanSig( $text, $parsing = false ) {
+	public function cleanSig( $text, $parsing = false ) {
 		if ( !$parsing ) {
 			global $wgTitle;
-			$this->mOptions = new ParserOptions;
-			$this->clearState();
-			$this->setTitle( $wgTitle );
-			$this->setOutputType = self::OT_PREPROCESS;
+			$magicScopeVariable = $this->lock();
+			$this->startParse( $wgTitle, new ParserOptions, self::OT_PREPROCESS, true );
 		}
 
 		# Option to disable this feature
@@ -4177,14 +4594,14 @@ class Parser {
 			return $text;
 		}
 
-		# FIXME: regex doesn't respect extension tags or nowiki
+		# @todo FIXME: Regex doesn't respect extension tags or nowiki
 		#  => Move this logic to braceSubstitution()
 		$substWord = MagicWord::get( 'subst' );
 		$substRegex = '/\{\{(?!(?:' . $substWord->getBaseRegex() . '))/x' . $substWord->getRegexCase();
 		$substText = '{{' . $substWord->getSynonym( 0 );
 
 		$text = preg_replace( $substRegex, $substText, $text );
-		$text = $this->cleanSigInSig( $text );
+		$text = self::cleanSigInSig( $text );
 		$dom = $this->preprocessToDom( $text );
 		$frame = $this->getPreprocessor()->newFrame();
 		$text = $frame->expand( $dom );
@@ -4197,12 +4614,12 @@ class Parser {
 	}
 
 	/**
-	 * Strip ~~~, ~~~~ and ~~~~~ out of signatures
+	 * Strip 3, 4 or 5 tildes out of signatures.
 	 *
-	 * @param $text String
-	 * @return String: signature text with /~{3,5}/ removed
+	 * @param string $text
+	 * @return string Signature text with /~{3,5}/ removed
 	 */
-	function cleanSigInSig( $text ) {
+	public static function cleanSigInSig( $text ) {
 		$text = preg_replace( '/~{3,5}/', '', $text );
 		return $text;
 	}
@@ -4210,8 +4627,27 @@ class Parser {
 	/**
 	 * Set up some variables which are usually set up in parse()
 	 * so that an external function can call some class members with confidence
+	 *
+	 * @param Title|null $title
+	 * @param ParserOptions $options
+	 * @param int $outputType
+	 * @param bool $clearState
 	 */
-	public function startExternalParse( Title $title = null, ParserOptions $options, $outputType, $clearState = true ) {
+	public function startExternalParse( Title $title = null, ParserOptions $options,
+		$outputType, $clearState = true
+	) {
+		$this->startParse( $title, $options, $outputType, $clearState );
+	}
+
+	/**
+	 * @param Title|null $title
+	 * @param ParserOptions $options
+	 * @param int $outputType
+	 * @param bool $clearState
+	 */
+	private function startParse( Title $title = null, ParserOptions $options,
+		$outputType, $clearState = true
+	) {
 		$this->setTitle( $title );
 		$this->mOptions = $options;
 		$this->setOutputType( $outputType );
@@ -4223,12 +4659,12 @@ class Parser {
 	/**
 	 * Wrapper for preprocess()
 	 *
-	 * @param $text String: the text to preprocess
-	 * @param $options ParserOptions: options
-	 * @return String
+	 * @param string $text The text to preprocess
+	 * @param ParserOptions $options Options
+	 * @param Title|null $title Title object or null to use $wgTitle
+	 * @return string
 	 */
-	public function transformMsg( $text, $options ) {
-		global $wgTitle;
+	public function transformMsg( $text, $options, $title = null ) {
 		static $executing = false;
 
 		# Guard against infinite recursion
@@ -4237,34 +4673,46 @@ class Parser {
 		}
 		$executing = true;
 
-		wfProfileIn( __METHOD__ );
-		$title = $wgTitle;
 		if ( !$title ) {
-			# It's not uncommon having a null $wgTitle in scripts. See r80898
-			# Create a ghost title in such case
-			$title = Title::newFromText( 'Dwimmerlaik' );
+			global $wgTitle;
+			$title = $wgTitle;
 		}
+
 		$text = $this->preprocess( $text, $title, $options );
 
 		$executing = false;
-		wfProfileOut( __METHOD__ );
 		return $text;
 	}
 
 	/**
-	 * Create an HTML-style tag, e.g. special text
+	 * Create an HTML-style tag, e.g. "special text"
 	 * The callback should have the following form:
-	 *    function myParserHook( $text, $params, $parser ) { ... }
+	 *    function myParserHook( $text, $params, $parser, $frame ) { ... }
 	 *
 	 * Transform and return $text. Use $parser for any required context, e.g. use
 	 * $parser->getTitle() and $parser->getOptions() not $wgTitle or $wgOut->mParserOptions
 	 *
-	 * @param $tag Mixed: the tag to use, e.g. 'hook' for 
-	 * @param $callback Mixed: the callback function (and object) to use for the tag
-	 * @return The old value of the mTagHooks array associated with the hook
+	 * Hooks may return extended information by returning an array, of which the
+	 * first numbered element (index 0) must be the return string, and all other
+	 * entries are extracted into local variables within an internal function
+	 * in the Parser class.
+	 *
+	 * This interface (introduced r61913) appears to be undocumented, but
+	 * 'markerType' is used by some core tag hooks to override which strip
+	 * array their results are placed in. **Use great caution if attempting
+	 * this interface, as it is not documented and injudicious use could smash
+	 * private variables.**
+	 *
+	 * @param string $tag The tag to use, e.g. 'hook' for ""
+	 * @param callable $callback The callback function (and object) to use for the tag
+	 * @throws MWException
+	 * @return callable|null The old value of the mTagHooks array associated with the hook
 	 */
-	public function setHook( $tag, $callback ) {
+	public function setHook( $tag, callable $callback ) {
 		$tag = strtolower( $tag );
+		if ( preg_match( '/[<>\r\n]/', $tag, $m ) ) {
+			throw new MWException( "Invalid character {$m[0]} in setHook('$tag', ...) call" );
+		}
 		$oldVal = isset( $this->mTagHooks[$tag] ) ? $this->mTagHooks[$tag] : null;
 		$this->mTagHooks[$tag] = $callback;
 		if ( !in_array( $tag, $this->mStripList ) ) {
@@ -4274,8 +4722,28 @@ class Parser {
 		return $oldVal;
 	}
 
-	function setTransparentTagHook( $tag, $callback ) {
+	/**
+	 * As setHook(), but letting the contents be parsed.
+	 *
+	 * Transparent tag hooks are like regular XML-style tag hooks, except they
+	 * operate late in the transformation sequence, on HTML instead of wikitext.
+	 *
+	 * This is probably obsoleted by things dealing with parser frames?
+	 * The only extension currently using it is geoserver.
+	 *
+	 * @since 1.10
+	 * @todo better document or deprecate this
+	 *
+	 * @param string $tag The tag to use, e.g. 'hook' for ""
+	 * @param callable $callback The callback function (and object) to use for the tag
+	 * @throws MWException
+	 * @return callable|null The old value of the mTagHooks array associated with the hook
+	 */
+	public function setTransparentTagHook( $tag, callable $callback ) {
 		$tag = strtolower( $tag );
+		if ( preg_match( '/[<>\r\n]/', $tag, $m ) ) {
+			throw new MWException( "Invalid character {$m[0]} in setTransparentHook('$tag', ...) call" );
+		}
 		$oldVal = isset( $this->mTransparentTagHooks[$tag] ) ? $this->mTransparentTagHooks[$tag] : null;
 		$this->mTransparentTagHooks[$tag] = $callback;
 
@@ -4285,8 +4753,9 @@ class Parser {
 	/**
 	 * Remove all tag hooks
 	 */
-	function clearTagHooks() {
-		$this->mTagHooks = array();
+	public function clearTagHooks() {
+		$this->mTagHooks = [];
+		$this->mFunctionTagHooks = [];
 		$this->mStripList = $this->mDefaultStripList;
 	}
 
@@ -4295,7 +4764,7 @@ class Parser {
 	 * The callback function should have the form:
 	 *    function myParserFunction( &$parser, $arg1, $arg2, $arg3 ) { ... }
 	 *
-	 * Or with SFH_OBJECT_ARGS:
+	 * Or with Parser::SFH_OBJECT_ARGS:
 	 *    function myParserFunction( $parser, $frame, $args ) { ... }
 	 *
 	 * The callback may either return the text result of the function, or an array with the text
@@ -4306,13 +4775,13 @@ class Parser {
 	 *   nowiki                    Wiki markup in the return value should be escaped
 	 *   isHTML                    The returned text is HTML, armour it against wikitext transformation
 	 *
-	 * @param $id String: The magic word ID
-	 * @param $callback Mixed: the callback function (and object) to use
-	 * @param $flags Integer: a combination of the following flags:
-	 *     SFH_NO_HASH   No leading hash, i.e. {{plural:...}} instead of {{#if:...}}
+	 * @param string $id The magic word ID
+	 * @param callable $callback The callback function (and object) to use
+	 * @param int $flags A combination of the following flags:
+	 *     Parser::SFH_NO_HASH      No leading hash, i.e. {{plural:...}} instead of {{#if:...}}
 	 *
-	 *     SFH_OBJECT_ARGS   Pass the template arguments as PPNode objects instead of text. This
-	 *     allows for conditional expansion of the parse tree, allowing you to eliminate dead
+	 *     Parser::SFH_OBJECT_ARGS  Pass the template arguments as PPNode objects instead of text.
+	 *     This allows for conditional expansion of the parse tree, allowing you to eliminate dead
 	 *     branches and thus speed up parsing. It is also possible to analyse the parse tree of
 	 *     the arguments, and to control the way they are expanded.
 	 *
@@ -4330,18 +4799,20 @@ class Parser {
 	 *     Please read the documentation in includes/parser/Preprocessor.php for more information
 	 *     about the methods available in PPFrame and PPNode.
 	 *
-	 * @return The old callback function for this name, if any
+	 * @throws MWException
+	 * @return string|callable The old callback function for this name, if any
 	 */
-	public function setFunctionHook( $id, $callback, $flags = 0 ) {
+	public function setFunctionHook( $id, callable $callback, $flags = 0 ) {
 		global $wgContLang;
 
 		$oldVal = isset( $this->mFunctionHooks[$id] ) ? $this->mFunctionHooks[$id][0] : null;
-		$this->mFunctionHooks[$id] = array( $callback, $flags );
+		$this->mFunctionHooks[$id] = [ $callback, $flags ];
 
 		# Add to function cache
 		$mw = MagicWord::get( $id );
-		if ( !$mw )
-			throw new MWException( __METHOD__.'() expecting a magic word identifier.' );
+		if ( !$mw ) {
+			throw new MWException( __METHOD__ . '() expecting a magic word identifier.' );
+		}
 
 		$synonyms = $mw->getSynonyms();
 		$sensitive = intval( $mw->isCaseSensitive() );
@@ -4352,7 +4823,7 @@ class Parser {
 				$syn = $wgContLang->lc( $syn );
 			}
 			# Add leading hash
-			if ( !( $flags & SFH_NO_HASH ) ) {
+			if ( !( $flags & self::SFH_NO_HASH ) ) {
 				$syn = '#' . $syn;
 			}
 			# Remove trailing colon
@@ -4367,22 +4838,30 @@ class Parser {
 	/**
 	 * Get all registered function hook identifiers
 	 *
-	 * @return Array
+	 * @return array
 	 */
-	function getFunctionHooks() {
+	public function getFunctionHooks() {
 		return array_keys( $this->mFunctionHooks );
 	}
 
 	/**
-	 * Create a tag function, e.g. some stuff.
+	 * Create a tag function, e.g. "some stuff".
 	 * Unlike tag hooks, tag functions are parsed at preprocessor level.
 	 * Unlike parser functions, their content is not preprocessed.
+	 * @param string $tag
+	 * @param callable $callback
+	 * @param int $flags
+	 * @throws MWException
+	 * @return null
 	 */
-	function setFunctionTagHook( $tag, $callback, $flags ) {
+	public function setFunctionTagHook( $tag, callable $callback, $flags ) {
 		$tag = strtolower( $tag );
+		if ( preg_match( '/[<>\r\n]/', $tag, $m ) ) {
+			throw new MWException( "Invalid character {$m[0]} in setFunctionTagHook('$tag', ...) call" );
+		}
 		$old = isset( $this->mFunctionTagHooks[$tag] ) ?
 			$this->mFunctionTagHooks[$tag] : null;
-		$this->mFunctionTagHooks[$tag] = array( $callback, $flags );
+		$this->mFunctionTagHooks[$tag] = [ $callback, $flags ];
 
 		if ( !in_array( $tag, $this->mStripList ) ) {
 			$this->mStripList[] = $tag;
@@ -4392,23 +4871,24 @@ class Parser {
 	}
 
 	/**
-	 * FIXME: update documentation. makeLinkObj() is deprecated.
-	 * Replace  link placeholders with actual links, in the buffer
-	 * Placeholders created in Skin::makeLinkObj()
-	 * Returns an array of link CSS classes, indexed by PDBK.
+	 * Replace "" link placeholders with actual links, in the buffer
+	 * Placeholders created in Linker::link()
+	 *
+	 * @param string &$text
+	 * @param int $options
 	 */
-	function replaceLinkHolders( &$text, $options = 0 ) {
-		return $this->mLinkHolders->replace( $text );
+	public function replaceLinkHolders( &$text, $options = 0 ) {
+		$this->mLinkHolders->replace( $text );
 	}
 
 	/**
-	 * Replace  link placeholders with plain text of links
+	 * Replace "" link placeholders with plain text of links
 	 * (not HTML-formatted).
 	 *
-	 * @param $text String
-	 * @return String
+	 * @param string $text
+	 * @return string
 	 */
-	function replaceLinkHoldersText( $text ) {
+	public function replaceLinkHoldersText( $text ) {
 		return $this->mLinkHolders->replaceText( $text );
 	}
 
@@ -4420,17 +4900,31 @@ class Parser {
 	 * given as text will return the HTML of a gallery with two images,
 	 * labeled 'The number "1"' and
 	 * 'A tree'.
+	 *
+	 * @param string $text
+	 * @param array $params
+	 * @return string HTML
 	 */
-	function renderImageGallery( $text, $params ) {
-		$ig = new ImageGallery();
+	public function renderImageGallery( $text, $params ) {
+		$mode = false;
+		if ( isset( $params['mode'] ) ) {
+			$mode = $params['mode'];
+		}
+
+		try {
+			$ig = ImageGalleryBase::factory( $mode );
+		} catch ( Exception $e ) {
+			// If invalid type set, fallback to default.
+			$ig = ImageGalleryBase::factory( false );
+		}
+
 		$ig->setContextTitle( $this->mTitle );
 		$ig->setShowBytes( false );
+		$ig->setShowDimensions( false );
 		$ig->setShowFilename( false );
 		$ig->setParser( $this );
 		$ig->setHideBadImages();
-		$ig->setAttributes( Sanitizer::validateTagAttributes( $params, 'table' ) );
-		$ig->useSkin( $this->mOptions->getSkin( $this->mTitle ) );
-		$ig->mRevisionId = $this->mRevisionId;
+		$ig->setAttributes( Sanitizer::validateTagAttributes( $params, 'ul' ) );
 
 		if ( isset( $params['showfilename'] ) ) {
 			$ig->setShowFilename( true );
@@ -4452,14 +4946,17 @@ class Parser {
 		if ( isset( $params['heights'] ) ) {
 			$ig->setHeights( $params['heights'] );
 		}
+		$ig->setAdditionalOptions( $params );
 
-		wfRunHooks( 'BeforeParserrenderImageGallery', array( &$this, &$ig ) );
+		// Avoid PHP 7.1 warning from passing $this by reference
+		$parser = $this;
+		Hooks::run( 'BeforeParserrenderImageGallery', [ &$parser, &$ig ] );
 
 		$lines = StringUtils::explode( "\n", $text );
 		foreach ( $lines as $line ) {
 			# match lines like these:
 			# Image:someimage.jpg|This is some image
-			$matches = array();
+			$matches = [];
 			preg_match( "/^([^|]+)(\\|(.*))?$/", $line, $matches );
 			# Skip empty lines
 			if ( count( $matches ) == 0 ) {
@@ -4467,54 +4964,144 @@ class Parser {
 			}
 
 			if ( strpos( $matches[0], '%' ) !== false ) {
-				$matches[1] = urldecode( $matches[1] );
+				$matches[1] = rawurldecode( $matches[1] );
 			}
-			$tp = Title::newFromText( $matches[1] );
-			$nt =& $tp;
-			if ( is_null( $nt ) ) {
+			$title = Title::newFromText( $matches[1], NS_FILE );
+			if ( is_null( $title ) ) {
 				# Bogus title. Ignore these so we don't bomb out later.
 				continue;
 			}
-			if ( isset( $matches[3] ) ) {
-				$label = $matches[3];
-			} else {
-				$label = '';
+
+			# We need to get what handler the file uses, to figure out parameters.
+			# Note, a hook can overide the file name, and chose an entirely different
+			# file (which potentially could be of a different type and have different handler).
+			$options = [];
+			$descQuery = false;
+			Hooks::run( 'BeforeParserFetchFileAndTitle',
+				[ $this, $title, &$options, &$descQuery ] );
+			# Don't register it now, as TraditionalImageGallery does that later.
+			$file = $this->fetchFileNoRegister( $title, $options );
+			$handler = $file ? $file->getHandler() : false;
+
+			$paramMap = [
+				'img_alt' => 'gallery-internal-alt',
+				'img_link' => 'gallery-internal-link',
+			];
+			if ( $handler ) {
+				$paramMap = $paramMap + $handler->getParamMap();
+				// We don't want people to specify per-image widths.
+				// Additionally the width parameter would need special casing anyhow.
+				unset( $paramMap['img_width'] );
 			}
 
-			$html = $this->recursiveTagParse( trim( $label ) );
+			$mwArray = new MagicWordArray( array_keys( $paramMap ) );
 
-			$ig->add( $nt, $html );
+			$label = '';
+			$alt = '';
+			$link = '';
+			$handlerOptions = [];
+			if ( isset( $matches[3] ) ) {
+				// look for an |alt= definition while trying not to break existing
+				// captions with multiple pipes (|) in it, until a more sensible grammar
+				// is defined for images in galleries
+
+				// FIXME: Doing recursiveTagParse at this stage, and the trim before
+				// splitting on '|' is a bit odd, and different from makeImage.
+				$matches[3] = $this->recursiveTagParse( trim( $matches[3] ) );
+				// Protect LanguageConverter markup
+				$parameterMatches = StringUtils::delimiterExplode(
+					'-{', '}-', '|', $matches[3], true /* nested */
+				);
+
+				foreach ( $parameterMatches as $parameterMatch ) {
+					list( $magicName, $match ) = $mwArray->matchVariableStartToEnd( $parameterMatch );
+					if ( $magicName ) {
+						$paramName = $paramMap[$magicName];
+
+						switch ( $paramName ) {
+						case 'gallery-internal-alt':
+							$alt = $this->stripAltText( $match, false );
+							break;
+						case 'gallery-internal-link':
+							$linkValue = strip_tags( $this->replaceLinkHoldersText( $match ) );
+							$chars = self::EXT_LINK_URL_CLASS;
+							$addr = self::EXT_LINK_ADDR;
+							$prots = $this->mUrlProtocols;
+							// check to see if link matches an absolute url, if not then it must be a wiki link.
+							if ( preg_match( '/^-{R|(.*)}-$/', $linkValue ) ) {
+								// Result of LanguageConverter::markNoConversion
+								// invoked on an external link.
+								$linkValue = substr( $linkValue, 4, -2 );
+							}
+							if ( preg_match( "/^($prots)$addr$chars*$/u", $linkValue ) ) {
+								$link = $linkValue;
+								$this->mOutput->addExternalLink( $link );
+							} else {
+								$localLinkTitle = Title::newFromText( $linkValue );
+								if ( $localLinkTitle !== null ) {
+									$this->mOutput->addLink( $localLinkTitle );
+									$link = $localLinkTitle->getLinkURL();
+								}
+							}
+							break;
+						default:
+							// Must be a handler specific parameter.
+							if ( $handler->validateParam( $paramName, $match ) ) {
+								$handlerOptions[$paramName] = $match;
+							} else {
+								// Guess not, consider it as caption.
+								wfDebug( "$parameterMatch failed parameter validation\n" );
+								$label = '|' . $parameterMatch;
+							}
+						}
 
-			# Only add real images (bug #5586)
-			if ( $nt->getNamespace() == NS_FILE ) {
-				$this->mOutput->addImage( $nt->getDBkey() );
+					} else {
+						// Last pipe wins.
+						$label = '|' . $parameterMatch;
+					}
+				}
+				// Remove the pipe.
+				$label = substr( $label, 1 );
 			}
+
+			$ig->add( $title, $label, $alt, $link, $handlerOptions );
 		}
-		return $ig->toHTML();
+		$html = $ig->toHTML();
+		Hooks::run( 'AfterParserFetchFileAndTitle', [ $this, $ig, &$html ] );
+		return $html;
 	}
 
-	function getImageParams( $handler ) {
+	/**
+	 * @param MediaHandler $handler
+	 * @return array
+	 */
+	public function getImageParams( $handler ) {
 		if ( $handler ) {
 			$handlerClass = get_class( $handler );
 		} else {
 			$handlerClass = '';
 		}
-		if ( !isset( $this->mImageParams[$handlerClass]  ) ) {
+		if ( !isset( $this->mImageParams[$handlerClass] ) ) {
 			# Initialise static lists
-			static $internalParamNames = array(
-				'horizAlign' => array( 'left', 'right', 'center', 'none' ),
-				'vertAlign' => array( 'baseline', 'sub', 'super', 'top', 'text-top', 'middle',
-					'bottom', 'text-bottom' ),
-				'frame' => array( 'thumbnail', 'manualthumb', 'framed', 'frameless',
-					'upright', 'border', 'link', 'alt' ),
-			);
+			static $internalParamNames = [
+				'horizAlign' => [ 'left', 'right', 'center', 'none' ],
+				'vertAlign' => [ 'baseline', 'sub', 'super', 'top', 'text-top', 'middle',
+					'bottom', 'text-bottom' ],
+				'frame' => [ 'thumbnail', 'manualthumb', 'framed', 'frameless',
+					'upright', 'border', 'link', 'alt', 'class' ],
+			];
 			static $internalParamMap;
 			if ( !$internalParamMap ) {
-				$internalParamMap = array();
+				$internalParamMap = [];
 				foreach ( $internalParamNames as $type => $names ) {
 					foreach ( $names as $name ) {
+						// For grep: img_left, img_right, img_center, img_none,
+						// img_baseline, img_sub, img_super, img_top, img_text_top, img_middle,
+						// img_bottom, img_text_bottom,
+						// img_thumbnail, img_manualthumb, img_framed, img_frameless, img_upright,
+						// img_border, img_link, img_alt, img_class
 						$magicName = str_replace( '-', '_', "img_$name" );
-						$internalParamMap[$magicName] = array( $type, $name );
+						$internalParamMap[$magicName] = [ $type, $name ];
 					}
 				}
 			}
@@ -4524,23 +5111,24 @@ class Parser {
 			if ( $handler ) {
 				$handlerParamMap = $handler->getParamMap();
 				foreach ( $handlerParamMap as $magic => $paramName ) {
-					$paramMap[$magic] = array( 'handler', $paramName );
+					$paramMap[$magic] = [ 'handler', $paramName ];
 				}
 			}
 			$this->mImageParams[$handlerClass] = $paramMap;
 			$this->mImageParamsMagicArray[$handlerClass] = new MagicWordArray( array_keys( $paramMap ) );
 		}
-		return array( $this->mImageParams[$handlerClass], $this->mImageParamsMagicArray[$handlerClass] );
+		return [ $this->mImageParams[$handlerClass], $this->mImageParamsMagicArray[$handlerClass] ];
 	}
 
 	/**
 	 * Parse image options text and use it to make an image
 	 *
-	 * @param $title Title
-	 * @param $options String
-	 * @param $holders LinkHolderArray
+	 * @param Title $title
+	 * @param string $options
+	 * @param LinkHolderArray|bool $holders
+	 * @return string HTML
 	 */
-	function makeImage( $title, $options, $holders = false ) {
+	public function makeImage( $title, $options, $holders = false ) {
 		# Check if the options text is of the form "options|alt text"
 		# Options are:
 		#  * thumbnail  make a thumbnail with enlarge-icon and caption, alignment depends on lang
@@ -4555,6 +5143,7 @@ class Parser {
 		#  * upright    reduce width for upright images, rounded to full __0 px
 		#  * border     draw a 1px border around the image
 		#  * alt        Text for HTML alt attribute (defaults to empty)
+		#  * class      Set a class for img node
 		#  * link       Set the target of the image link. Can be external, interwiki, or local
 		# vertical-align values (no % or length right now):
 		#  * baseline
@@ -4566,28 +5155,33 @@ class Parser {
 		#  * bottom
 		#  * text-bottom
 
-		$parts = StringUtils::explode( "|", $options );
-		$sk = $this->mOptions->getSkin( $this->mTitle );
+		# Protect LanguageConverter markup when splitting into parts
+		$parts = StringUtils::delimiterExplode(
+			'-{', '}-', '|', $options, true /* allow nesting */
+		);
 
 		# Give extensions a chance to select the file revision for us
-		$skip = $time = $descQuery = false;
-		wfRunHooks( 'BeforeParserMakeImageLinkObj', array( &$this, &$title, &$skip, &$time, &$descQuery ) );
-
-		if ( $skip ) {
-			return $sk->link( $title );
-		}
+		$options = [];
+		$descQuery = false;
+		Hooks::run( 'BeforeParserFetchFileAndTitle',
+			[ $this, $title, &$options, &$descQuery ] );
+		# Fetch and register the file (file title may be different via hooks)
+		list( $file, $title ) = $this->fetchFileAndTitle( $title, $options );
 
-		# Get the file
-		$file = wfFindFile( $title, array( 'time' => $time ) );
 		# Get parameter map
 		$handler = $file ? $file->getHandler() : false;
 
 		list( $paramMap, $mwArray ) = $this->getImageParams( $handler );
 
+		if ( !$file ) {
+			$this->addTrackingCategory( 'broken-file-category' );
+		}
+
 		# Process the input parameters
 		$caption = '';
-		$params = array( 'frame' => array(), 'handler' => array(),
-			'horizAlign' => array(), 'vertAlign' => array() );
+		$params = [ 'frame' => [], 'handler' => [],
+			'horizAlign' => [], 'vertAlign' => [] ];
+		$seenformat = false;
 		foreach ( $parts as $part ) {
 			$part = trim( $part );
 			list( $magicName, $value ) = $mwArray->matchVariableStartToEnd( $part );
@@ -4597,37 +5191,33 @@ class Parser {
 
 				# Special case; width and height come in one variable together
 				if ( $type === 'handler' && $paramName === 'width' ) {
-					$m = array();
-					# (bug 13500) In both cases (width/height and width only),
-					# permit trailing "px" for backward compatibility.
-					if ( preg_match( '/^([0-9]*)x([0-9]*)\s*(?:px)?\s*$/', $value, $m ) ) {
-						$width = intval( $m[1] );
-						$height = intval( $m[2] );
+					$parsedWidthParam = $this->parseWidthParam( $value );
+					if ( isset( $parsedWidthParam['width'] ) ) {
+						$width = $parsedWidthParam['width'];
 						if ( $handler->validateParam( 'width', $width ) ) {
 							$params[$type]['width'] = $width;
 							$validated = true;
 						}
+					}
+					if ( isset( $parsedWidthParam['height'] ) ) {
+						$height = $parsedWidthParam['height'];
 						if ( $handler->validateParam( 'height', $height ) ) {
 							$params[$type]['height'] = $height;
 							$validated = true;
 						}
-					} elseif ( preg_match( '/^[0-9]*\s*(?:px)?\s*$/', $value ) ) {
-						$width = intval( $value );
-						if ( $handler->validateParam( 'width', $width ) ) {
-							$params[$type]['width'] = $width;
-							$validated = true;
-						}
-					} # else no validation -- bug 13436
+					}
+					# else no validation -- T15436
 				} else {
 					if ( $type === 'handler' ) {
 						# Validate handler parameter
 						$validated = $handler->validateParam( $paramName, $value );
 					} else {
 						# Validate internal parameters
-						switch( $paramName ) {
+						switch ( $paramName ) {
 						case 'manualthumb':
 						case 'alt':
-							# @todo Fixme: possibly check validity here for
+						case 'class':
+							# @todo FIXME: Possibly check validity here for
 							# manualthumb? downstream behavior seems odd with
 							# missing manual thumbs.
 							$validated = true;
@@ -4635,13 +5225,14 @@ class Parser {
 							break;
 						case 'link':
 							$chars = self::EXT_LINK_URL_CLASS;
+							$addr = self::EXT_LINK_ADDR;
 							$prots = $this->mUrlProtocols;
 							if ( $value === '' ) {
 								$paramName = 'no-link';
 								$value = true;
 								$validated = true;
-							} elseif ( preg_match( "/^$prots/", $value ) ) {
-								if ( preg_match( "/^($prots)$chars+$/", $value, $m ) ) {
+							} elseif ( preg_match( "/^((?i)$prots)/", $value ) ) {
+								if ( preg_match( "/^((?i)$prots)$addr$chars*$/u", $value, $m ) ) {
 									$paramName = 'link-url';
 									$this->mOutput->addExternalLink( $value );
 									if ( $this->mOptions->getExternalLinkTarget() ) {
@@ -4659,6 +5250,13 @@ class Parser {
 								}
 							}
 							break;
+						case 'frameless':
+						case 'framed':
+						case 'thumbnail':
+							// use first appearing option, discard others.
+							$validated = !$seenformat;
+							$seenformat = true;
+							break;
 						default:
 							# Most other things appear to be empty or numeric...
 							$validated = ( $value === false || is_numeric( trim( $value ) ) );
@@ -4686,22 +5284,20 @@ class Parser {
 		$params['frame']['caption'] = $caption;
 
 		# Will the image be presented in a frame, with the caption below?
-		$imageIsFramed = isset( $params['frame']['frame'] ) ||
-		                 isset( $params['frame']['framed'] ) ||
-		                 isset( $params['frame']['thumbnail'] ) ||
-		                 isset( $params['frame']['manualthumb'] );
+		$imageIsFramed = isset( $params['frame']['frame'] )
+			|| isset( $params['frame']['framed'] )
+			|| isset( $params['frame']['thumbnail'] )
+			|| isset( $params['frame']['manualthumb'] );
 
 		# In the old days, [[Image:Foo|text...]] would set alt text.  Later it
 		# came to also set the caption, ordinary text after the image -- which
 		# makes no sense, because that just repeats the text multiple times in
 		# screen readers.  It *also* came to set the title attribute.
-		#
 		# Now that we have an alt attribute, we should not set the alt text to
 		# equal the caption: that's worse than useless, it just repeats the
 		# text.  This is the framed/thumbnail case.  If there's no caption, we
 		# use the unnamed parameter for alt text as well, just for the time be-
 		# ing, if the unnamed param is set and the alt param is not.
-		#
 		# For the future, we need to figure out if we want to tweak this more,
 		# e.g., introducing a title= parameter for the title; ignoring the un-
 		# named parameter entirely for images without a caption; adding an ex-
@@ -4718,7 +5314,7 @@ class Parser {
 		} else { # Inline image
 			if ( !isset( $params['frame']['alt'] ) ) {
 				# No alt text, use the "caption" for the alt text
-				if ( $caption !== '') {
+				if ( $caption !== '' ) {
 					$params['frame']['alt'] = $this->stripAltText( $caption, $holders );
 				} else {
 					# No caption, fall back to using the filename for the
@@ -4730,10 +5326,12 @@ class Parser {
 			$params['frame']['title'] = $this->stripAltText( $caption, $holders );
 		}
 
-		wfRunHooks( 'ParserMakeImageParams', array( $title, $file, &$params ) );
+		Hooks::run( 'ParserMakeImageParams', [ $title, $file, &$params, $this ] );
 
 		# Linker does the rest
-		$ret = $sk->makeImageLink2( $title, $file, $params['frame'], $params['handler'], $time, $descQuery, $this->mOptions->getThumbSize() );
+		$time = isset( $options['time'] ) ? $options['time'] : false;
+		$ret = Linker::makeImageLink( $this, $title, $file, $params['frame'], $params['handler'],
+			$time, $descQuery, $this->mOptions->getThumbSize() );
 
 		# Give the handler a chance to modify the parser object
 		if ( $handler ) {
@@ -4743,6 +5341,11 @@ class Parser {
 		return $ret;
 	}
 
+	/**
+	 * @param string $caption
+	 * @param LinkHolderArray|bool $holders
+	 * @return mixed|string
+	 */
 	protected function stripAltText( $caption, $holders ) {
 		# Strip bad stuff out of the title (tooltip).  We can't just use
 		# replaceLinkHoldersText() here, because if this function is called
@@ -4765,10 +5368,14 @@ class Parser {
 	/**
 	 * Set a flag in the output object indicating that the content is dynamic and
 	 * shouldn't be cached.
+	 * @deprecated since 1.28; use getOutput()->updateCacheExpiry()
 	 */
-	function disableCache() {
+	public function disableCache() {
 		wfDebug( "Parser output marked as uncacheable.\n" );
-		$this->mOutput->setCacheTime( -1 ); // old style, for compatibility
+		if ( !$this->mOutput ) {
+			throw new MWException( __METHOD__ .
+				" can only be called when actually parsing something" );
+		}
 		$this->mOutput->updateCacheExpiry( 0 ); // new style, for consistency
 	}
 
@@ -4776,12 +5383,11 @@ class Parser {
 	 * Callback from the Sanitizer for expanding items found in HTML attribute
 	 * values, so they can be safely tested and escaped.
 	 *
-	 * @param $text String
-	 * @param $frame PPFrame
-	 * @return String
-	 * @private
+	 * @param string &$text
+	 * @param bool|PPFrame $frame
+	 * @return string
 	 */
-	function attributeStripCallback( &$text, $frame = false ) {
+	public function attributeStripCallback( &$text, $frame = false ) {
 		$text = $this->replaceVariables( $text, $frame );
 		$text = $this->mStripState->unstripBoth( $text );
 		return $text;
@@ -4789,9 +5395,47 @@ class Parser {
 
 	/**
 	 * Accessor
+	 *
+	 * @return array
+	 */
+	public function getTags() {
+		return array_merge(
+			array_keys( $this->mTransparentTagHooks ),
+			array_keys( $this->mTagHooks ),
+			array_keys( $this->mFunctionTagHooks )
+		);
+	}
+
+	/**
+	 * Replace transparent tags in $text with the values given by the callbacks.
+	 *
+	 * Transparent tag hooks are like regular XML-style tag hooks, except they
+	 * operate late in the transformation sequence, on HTML instead of wikitext.
+	 *
+	 * @param string $text
+	 *
+	 * @return string
 	 */
-	function getTags() {
-		return array_merge( array_keys( $this->mTransparentTagHooks ), array_keys( $this->mTagHooks ) );
+	public function replaceTransparentTags( $text ) {
+		$matches = [];
+		$elements = array_keys( $this->mTransparentTagHooks );
+		$text = self::extractTagsAndParams( $elements, $text, $matches );
+		$replacements = [];
+
+		foreach ( $matches as $marker => $data ) {
+			list( $element, $content, $params, $tag ) = $data;
+			$tagName = strtolower( $element );
+			if ( isset( $this->mTransparentTagHooks[$tagName] ) ) {
+				$output = call_user_func_array(
+					$this->mTransparentTagHooks[$tagName],
+					[ $content, $params, $this ]
+				);
+			} else {
+				$output = $tag;
+			}
+			$replacements[$marker] = $output;
+		}
+		return strtr( $text, $replacements );
 	}
 
 	/**
@@ -4800,43 +5444,65 @@ class Parser {
 	 *
 	 * External callers should use the getSection and replaceSection methods.
 	 *
-	 * @param $text String: Page wikitext
-	 * @param $section String: a section identifier string of the form:
-	 *    -  - ... - 

+	 * @param string $text Page wikitext
+	 * @param string|int $sectionId A section identifier string of the form:
+	 *   " -  - ... - 
"
 	 *
 	 * Currently the only recognised flag is "T", which means the target section number
 	 * was derived during a template inclusion parse, in other words this is a template
 	 * section edit link. If no flags are given, it was an ordinary section edit link.
 	 * This flag is required to avoid a section numbering mismatch when a section is
-	 * enclosed by  (bug 6563).
+	 * enclosed by "" (T8563).
 	 *
 	 * The section number 0 pulls the text before the first heading; other numbers will
 	 * pull the given section along with its lower-level subsections. If the section is
 	 * not found, $mode=get will return $newtext, and $mode=replace will return $text.
 	 *
-	 * @param $mode String: one of "get" or "replace"
-	 * @param $newText String: replacement text for section data.
-	 * @return String: for "get", the extracted section text.
-	 *                 for "replace", the whole page with the section replaced.
-	 */
-	private function extractSections( $text, $section, $mode, $newText='' ) {
-		global $wgTitle;
-		$this->mOptions = new ParserOptions;
-		$this->clearState();
-		$this->setTitle( $wgTitle ); # not generally used but removes an ugly failure mode
-		$this->setOutputType( self::OT_PLAIN );
+	 * Section 0 is always considered to exist, even if it only contains the empty
+	 * string. If $text is the empty string and section 0 is replaced, $newText is
+	 * returned.
+	 *
+	 * @param string $mode One of "get" or "replace"
+	 * @param string $newText Replacement text for section data.
+	 * @return string For "get", the extracted section text.
+	 *   for "replace", the whole page with the section replaced.
+	 */
+	private function extractSections( $text, $sectionId, $mode, $newText = '' ) {
+		global $wgTitle; # not generally used but removes an ugly failure mode
+
+		$magicScopeVariable = $this->lock();
+		$this->startParse( $wgTitle, new ParserOptions, self::OT_PLAIN, true );
 		$outText = '';
 		$frame = $this->getPreprocessor()->newFrame();
 
 		# Process section extraction flags
 		$flags = 0;
-		$sectionParts = explode( '-', $section );
+		$sectionParts = explode( '-', $sectionId );
 		$sectionIndex = array_pop( $sectionParts );
 		foreach ( $sectionParts as $part ) {
 			if ( $part === 'T' ) {
 				$flags |= self::PTD_FOR_INCLUSION;
 			}
 		}
+
+		# Check for empty input
+		if ( strval( $text ) === '' ) {
+			# Only sections 0 and T-0 exist in an empty document
+			if ( $sectionIndex == 0 ) {
+				if ( $mode === 'get' ) {
+					return '';
+				} else {
+					return $newText;
+				}
+			} else {
+				if ( $mode === 'get' ) {
+					return $newText;
+				} else {
+					return $text;
+				}
+			}
+		}
+
 		# Preprocess the text
 		$root = $this->preprocessToDom( $text, $flags );
 
@@ -4919,64 +5585,91 @@ class Parser {
 	 *
 	 * If a section contains subsections, these are also returned.
 	 *
-	 * @param $text String: text to look in
-	 * @param $section String: section identifier
-	 * @param $deftext String: default to return if section is not found
-	 * @return string text of the requested section
+	 * @param string $text Text to look in
+	 * @param string|int $sectionId Section identifier as a number or string
+	 * (e.g. 0, 1 or 'T-1').
+	 * @param string $defaultText Default to return if section is not found
+	 *
+	 * @return string Text of the requested section
 	 */
-	public function getSection( $text, $section, $deftext='' ) {
-		return $this->extractSections( $text, $section, "get", $deftext );
+	public function getSection( $text, $sectionId, $defaultText = '' ) {
+		return $this->extractSections( $text, $sectionId, 'get', $defaultText );
 	}
 
 	/**
 	 * This function returns $oldtext after the content of the section
-	 * specified by $section has been replaced with $text.
+	 * specified by $section has been replaced with $text. If the target
+	 * section does not exist, $oldtext is returned unchanged.
 	 *
-	 * @param $text String: former text of the article
-	 * @param $section Numeric: section identifier
-	 * @param $text String: replacing text
-	 * #return String: modified text
+	 * @param string $oldText Former text of the article
+	 * @param string|int $sectionId Section identifier as a number or string
+	 * (e.g. 0, 1 or 'T-1').
+	 * @param string $newText Replacing text
+	 *
+	 * @return string Modified text
 	 */
-	public function replaceSection( $oldtext, $section, $text ) {
-		return $this->extractSections( $oldtext, $section, "replace", $text );
+	public function replaceSection( $oldText, $sectionId, $newText ) {
+		return $this->extractSections( $oldText, $sectionId, 'replace', $newText );
 	}
 
 	/**
 	 * Get the ID of the revision we are parsing
 	 *
-	 * @return Mixed: integer or null
+	 * @return int|null
 	 */
-	function getRevisionId() {
+	public function getRevisionId() {
 		return $this->mRevisionId;
 	}
 
+	/**
+	 * Get the revision object for $this->mRevisionId
+	 *
+	 * @return Revision|null Either a Revision object or null
+	 * @since 1.23 (public since 1.23)
+	 */
+	public function getRevisionObject() {
+		if ( !is_null( $this->mRevisionObject ) ) {
+			return $this->mRevisionObject;
+		}
+		if ( is_null( $this->mRevisionId ) ) {
+			return null;
+		}
+
+		$rev = call_user_func(
+			$this->mOptions->getCurrentRevisionCallback(), $this->getTitle(), $this
+		);
+
+		# If the parse is for a new revision, then the callback should have
+		# already been set to force the object and should match mRevisionId.
+		# If not, try to fetch by mRevisionId for sanity.
+		if ( $rev && $rev->getId() != $this->mRevisionId ) {
+			$rev = Revision::newFromId( $this->mRevisionId );
+		}
+
+		$this->mRevisionObject = $rev;
+
+		return $this->mRevisionObject;
+	}
+
 	/**
 	 * Get the timestamp associated with the current revision, adjusted for
 	 * the default server-local timestamp
+	 * @return string
 	 */
-	function getRevisionTimestamp() {
+	public function getRevisionTimestamp() {
 		if ( is_null( $this->mRevisionTimestamp ) ) {
-			wfProfileIn( __METHOD__ );
 			global $wgContLang;
-			$dbr = wfGetDB( DB_SLAVE );
-			$timestamp = $dbr->selectField( 'revision', 'rev_timestamp',
-					array( 'rev_id' => $this->mRevisionId ), __METHOD__ );
 
-			# Normalize timestamp to internal MW format for timezone processing.
-			# This has the added side-effect of replacing a null value with
-			# the current time, which gives us more sensible behavior for
-			# previews.
-			$timestamp = wfTimestamp( TS_MW, $timestamp );
+			$revObject = $this->getRevisionObject();
+			$timestamp = $revObject ? $revObject->getTimestamp() : wfTimestampNow();
 
 			# The cryptic '' timezone parameter tells to use the site-default
 			# timezone offset instead of the user settings.
-			#
 			# Since this value will be saved into the parser cache, served
 			# to other users, and potentially even used inside links and such,
 			# it needs to be consistent for all visitors.
 			$this->mRevisionTimestamp = $wgContLang->userAdjust( $timestamp, '' );
 
-			wfProfileOut( __METHOD__ );
 		}
 		return $this->mRevisionTimestamp;
 	}
@@ -4984,25 +5677,48 @@ class Parser {
 	/**
 	 * Get the name of the user that edited the last revision
 	 *
-	 * @return String: user name
+	 * @return string User name
 	 */
-	function getRevisionUser() {
-		# if this template is subst: the revision id will be blank,
-		# so just use the current user's name
-		if ( $this->mRevisionId ) {
-			$revision = Revision::newFromId( $this->mRevisionId );
-			$revuser = $revision->getUserText();
-		} else {
-			global $wgUser;
-			$revuser = $wgUser->getName();
+	public function getRevisionUser() {
+		if ( is_null( $this->mRevisionUser ) ) {
+			$revObject = $this->getRevisionObject();
+
+			# if this template is subst: the revision id will be blank,
+			# so just use the current user's name
+			if ( $revObject ) {
+				$this->mRevisionUser = $revObject->getUserText();
+			} elseif ( $this->ot['wiki'] || $this->mOptions->getIsPreview() ) {
+				$this->mRevisionUser = $this->getUser()->getName();
+			}
+		}
+		return $this->mRevisionUser;
+	}
+
+	/**
+	 * Get the size of the revision
+	 *
+	 * @return int|null Revision size
+	 */
+	public function getRevisionSize() {
+		if ( is_null( $this->mRevisionSize ) ) {
+			$revObject = $this->getRevisionObject();
+
+			# if this variable is subst: the revision id will be blank,
+			# so just use the parser input size, because the own substituation
+			# will change the size.
+			if ( $revObject ) {
+				$this->mRevisionSize = $revObject->getSize();
+			} else {
+				$this->mRevisionSize = $this->mInputSize;
+			}
 		}
-		return $revuser;
+		return $this->mRevisionSize;
 	}
 
 	/**
 	 * Mutator for $mDefaultSort
 	 *
-	 * @param $sort New value
+	 * @param string $sort New value
 	 */
 	public function setDefaultSort( $sort ) {
 		$this->mDefaultSort = $sort;
@@ -5031,7 +5747,7 @@ class Parser {
 	 * Accessor for $mDefaultSort
 	 * Unlike getDefaultSort(), will return false if none is set
 	 *
-	 * @return string or false
+	 * @return string|bool
 	 */
 	public function getCustomDefaultSort() {
 		return $this->mDefaultSort;
@@ -5041,27 +5757,44 @@ class Parser {
 	 * Try to guess the section anchor name based on a wikitext fragment
 	 * presumably extracted from a heading, for example "Header" from
 	 * "== Header ==".
+	 *
+	 * @param string $text
+	 *
+	 * @return string
 	 */
 	public function guessSectionNameFromWikiText( $text ) {
 		# Strip out wikitext links(they break the anchor)
 		$text = $this->stripSectionName( $text );
 		$text = Sanitizer::normalizeSectionNameWhitespace( $text );
-		return '#' . Sanitizer::escapeId( $text, 'noninitial' );
+		$text = Sanitizer::decodeCharReferences( $text );
+		return '#' . Sanitizer::escapeIdForLink( $text );
 	}
 
 	/**
 	 * Same as guessSectionNameFromWikiText(), but produces legacy anchors
-	 * instead.  For use in redirects, since IE6 interprets Redirect: headers
-	 * as something other than UTF-8 (apparently?), resulting in breakage.
+	 * instead, if possible. For use in redirects, since various versions
+	 * of Microsoft browsers interpret Location: headers as something other
+	 * than UTF-8, resulting in breakage.
 	 *
-	 * @param $text String: The section name
+	 * @param string $text The section name
 	 * @return string An anchor
 	 */
 	public function guessLegacySectionNameFromWikiText( $text ) {
+		global $wgFragmentMode;
+
 		# Strip out wikitext links(they break the anchor)
 		$text = $this->stripSectionName( $text );
 		$text = Sanitizer::normalizeSectionNameWhitespace( $text );
-		return '#' . Sanitizer::escapeId( $text, array( 'noninitial', 'legacy' ) );
+		$text = Sanitizer::decodeCharReferences( $text );
+
+		if ( isset( $wgFragmentMode[1] ) && $wgFragmentMode[1] === 'legacy' ) {
+			// ForAttribute() and ForLink() are the same for legacy encoding
+			$id = Sanitizer::escapeIdForAttribute( $text, Sanitizer::ID_FALLBACK );
+		} else {
+			$id = Sanitizer::escapeIdForLink( $text );
+		}
+
+		return "#$id";
 	}
 
 	/**
@@ -5074,19 +5807,20 @@ class Parser {
 	 * to create valid section anchors by mimicing the output of the
 	 * parser when headings are parsed.
 	 *
-	 * @param $text String: text string to be stripped of wikitext
+	 * @param string $text Text string to be stripped of wikitext
 	 * for use in a Section anchor
-	 * @return Filtered text string
+	 * @return string Filtered text string
 	 */
 	public function stripSectionName( $text ) {
 		# Strip internal link markup
 		$text = preg_replace( '/\[\[:?([^[|]+)\|([^[]+)\]\]/', '$2', $text );
 		$text = preg_replace( '/\[\[:?([^[]+)\|?\]\]/', '$1', $text );
 
-		# Strip external link markup (FIXME: Not Tolerant to blank link text
-		# I.E. [http://www.mediawiki.org] will render as [1] or something depending
+		# Strip external link markup
+		# @todo FIXME: Not tolerant to blank link text
+		# I.E. [https://www.mediawiki.org] will render as [1] or something depending
 		# on how many empty links there are on the page - need to figure that out.
-		$text = preg_replace( '/\[(?:' . wfUrlProtocols() . ')([^ ]+?) ([^[]+)\]/', '$2', $text );
+		$text = preg_replace( '/\[(?i:' . $this->mUrlProtocols . ')([^ ]+?) ([^[]+)\]/', '$2', $text );
 
 		# Parse wikitext quotes (italics & bold)
 		$text = $this->doQuotes( $text );
@@ -5098,41 +5832,67 @@ class Parser {
 
 	/**
 	 * strip/replaceVariables/unstrip for preprocessor regression testing
+	 *
+	 * @param string $text
+	 * @param Title $title
+	 * @param ParserOptions $options
+	 * @param int $outputType
+	 *
+	 * @return string
 	 */
-	function testSrvus( $text, $title, ParserOptions $options, $outputType = self::OT_HTML ) {
-		$this->mOptions = $options;
-		$this->clearState();
-		if ( !$title instanceof Title ) {
-			$title = Title::newFromText( $title );
-		}
-		$this->mTitle = $title;
-		$this->setOutputType( $outputType );
+	public function testSrvus( $text, Title $title, ParserOptions $options,
+		$outputType = self::OT_HTML
+	) {
+		$magicScopeVariable = $this->lock();
+		$this->startParse( $title, $options, $outputType, true );
+
 		$text = $this->replaceVariables( $text );
 		$text = $this->mStripState->unstripBoth( $text );
 		$text = Sanitizer::removeHTMLtags( $text );
 		return $text;
 	}
 
-	function testPst( $text, $title, $options ) {
-		global $wgUser;
-		if ( !$title instanceof Title ) {
-			$title = Title::newFromText( $title );
-		}
-		return $this->preSaveTransform( $text, $title, $wgUser, $options );
+	/**
+	 * @param string $text
+	 * @param Title $title
+	 * @param ParserOptions $options
+	 * @return string
+	 */
+	public function testPst( $text, Title $title, ParserOptions $options ) {
+		return $this->preSaveTransform( $text, $title, $options->getUser(), $options );
 	}
 
-	function testPreprocess( $text, $title, $options ) {
-		if ( !$title instanceof Title ) {
-			$title = Title::newFromText( $title );
-		}
+	/**
+	 * @param string $text
+	 * @param Title $title
+	 * @param ParserOptions $options
+	 * @return string
+	 */
+	public function testPreprocess( $text, Title $title, ParserOptions $options ) {
 		return $this->testSrvus( $text, $title, $options, self::OT_PREPROCESS );
 	}
 
-	function markerSkipCallback( $s, $callback ) {
+	/**
+	 * Call a callback function on all regions of the given text that are not
+	 * inside strip markers, and replace those regions with the return value
+	 * of the callback. For example, with input:
+	 *
+	 *  aaabbb
+	 *
+	 * This will call the callback function twice, with 'aaa' and 'bbb'. Those
+	 * two strings will be replaced with the value returned by the callback in
+	 * each case.
+	 *
+	 * @param string $s
+	 * @param callable $callback
+	 *
+	 * @return string
+	 */
+	public function markerSkipCallback( $s, $callback ) {
 		$i = 0;
 		$out = '';
 		while ( $i < strlen( $s ) ) {
-			$markerStart = strpos( $s, $this->mUniqPrefix, $i );
+			$markerStart = strpos( $s, self::MARKER_PREFIX, $i );
 			if ( $markerStart === false ) {
 				$out .= call_user_func( $callback, substr( $s, $i ) );
 				break;
@@ -5152,178 +5912,189 @@ class Parser {
 		return $out;
 	}
 
-	function serialiseHalfParsedText( $text ) {
-		$data = array();
-		$data['text'] = $text;
-
-		# First, find all strip markers, and store their
-		#  data in an array.
-		$stripState = new StripState;
-		$pos = 0;
-		while ( ( $start_pos = strpos( $text, $this->mUniqPrefix, $pos ) )
-			&& ( $end_pos = strpos( $text, self::MARKER_SUFFIX, $pos ) ) )
-		{
-			$end_pos += strlen( self::MARKER_SUFFIX );
-			$marker = substr( $text, $start_pos, $end_pos-$start_pos );
-
-			if ( !empty( $this->mStripState->general->data[$marker] ) ) {
-				$replaceArray = $stripState->general;
-				$stripText = $this->mStripState->general->data[$marker];
-			} elseif ( !empty( $this->mStripState->nowiki->data[$marker] ) ) {
-				$replaceArray = $stripState->nowiki;
-				$stripText = $this->mStripState->nowiki->data[$marker];
-			} else {
-				throw new MWException( "Hanging strip marker: '$marker'." );
-			}
-
-			$replaceArray->setPair( $marker, $stripText );
-			$pos = $end_pos;
-		}
-		$data['stripstate'] = $stripState;
-
-		# Now, find all of our links, and store THEIR
-		#  data in an array! :)
-		$links = array( 'internal' => array(), 'interwiki' => array() );
-		$pos = 0;
-
-		# Internal links
-		while ( ( $start_pos = strpos( $text, '' ) ) );
-			$links['internal'][$ns][] = $this->mLinkHolders->internals[$ns][$key];
-			$pos = $start_pos + strlen( "" );
-		}
-
-		$pos = 0;
-
-		# Interwiki links
-		while ( ( $start_pos = strpos( $text, '' ) ) );
-			$links['interwiki'][] = $this->mLinkHolders->interwiki[$key];
-			$pos = $start_pos + strlen( "" );
-		}
-
-		$data['linkholder'] = $links;
-
-		return $data;
-	}
-
 	/**
 	 * Remove any strip markers found in the given text.
 	 *
-	 * @param $text Input string
+	 * @param string $text Input string
 	 * @return string
 	 */
-	function killMarkers( $text ) {
-		return preg_replace( "/{$this->mUniqPrefix}[^\x7f]+" . self::MARKER_SUFFIX . '/', '', $text );
+	public function killMarkers( $text ) {
+		return $this->mStripState->killMarkers( $text );
+	}
+
+	/**
+	 * Save the parser state required to convert the given half-parsed text to
+	 * HTML. "Half-parsed" in this context means the output of
+	 * recursiveTagParse() or internalParse(). This output has strip markers
+	 * from replaceVariables (extensionSubstitution() etc.), and link
+	 * placeholders from replaceLinkHolders().
+	 *
+	 * Returns an array which can be serialized and stored persistently. This
+	 * array can later be loaded into another parser instance with
+	 * unserializeHalfParsedText(). The text can then be safely incorporated into
+	 * the return value of a parser hook.
+	 *
+	 * @param string $text
+	 *
+	 * @return array
+	 */
+	public function serializeHalfParsedText( $text ) {
+		$data = [
+			'text' => $text,
+			'version' => self::HALF_PARSED_VERSION,
+			'stripState' => $this->mStripState->getSubState( $text ),
+			'linkHolders' => $this->mLinkHolders->getSubArray( $text )
+		];
+		return $data;
 	}
 
 	/**
-	 * TODO: document
-	 * @param $data Array
-	 * @param $intPrefix String unique identifying prefix
-	 * @return String
+	 * Load the parser state given in the $data array, which is assumed to
+	 * have been generated by serializeHalfParsedText(). The text contents is
+	 * extracted from the array, and its markers are transformed into markers
+	 * appropriate for the current Parser instance. This transformed text is
+	 * returned, and can be safely included in the return value of a parser
+	 * hook.
+	 *
+	 * If the $data array has been stored persistently, the caller should first
+	 * check whether it is still valid, by calling isValidHalfParsedText().
+	 *
+	 * @param array $data Serialized data
+	 * @throws MWException
+	 * @return string
 	 */
-	function unserialiseHalfParsedText( $data, $intPrefix = null ) {
-		if ( !$intPrefix ) {
-			$intPrefix = self::getRandomString();
+	public function unserializeHalfParsedText( $data ) {
+		if ( !isset( $data['version'] ) || $data['version'] != self::HALF_PARSED_VERSION ) {
+			throw new MWException( __METHOD__ . ': invalid version' );
 		}
 
 		# First, extract the strip state.
-		$stripState = $data['stripstate'];
-		$this->mStripState->general->merge( $stripState->general );
-		$this->mStripState->nowiki->merge( $stripState->nowiki );
+		$texts = [ $data['text'] ];
+		$texts = $this->mStripState->merge( $data['stripState'], $texts );
 
-		# Now, extract the text, and renumber links
-		$text = $data['text'];
-		$links = $data['linkholder'];
+		# Now renumber links
+		$texts = $this->mLinkHolders->mergeForeign( $data['linkHolders'], $texts );
 
-		# Internal...
-		foreach ( $links['internal'] as $ns => $nsLinks ) {
-			foreach ( $nsLinks as $key => $entry ) {
-				$newKey = $intPrefix . '-' . $key;
-				$this->mLinkHolders->internals[$ns][$newKey] = $entry;
+		# Should be good to go.
+		return $texts[0];
+	}
 
-				$text = str_replace( "", "", $text );
-			}
-		}
+	/**
+	 * Returns true if the given array, presumed to be generated by
+	 * serializeHalfParsedText(), is compatible with the current version of the
+	 * parser.
+	 *
+	 * @param array $data
+	 *
+	 * @return bool
+	 */
+	public function isValidHalfParsedText( $data ) {
+		return isset( $data['version'] ) && $data['version'] == self::HALF_PARSED_VERSION;
+	}
 
-		# Interwiki...
-		foreach ( $links['interwiki'] as $key => $entry ) {
-			$newKey = "$intPrefix-$key";
-			$this->mLinkHolders->interwikis[$newKey] = $entry;
+	/**
+	 * Parsed a width param of imagelink like 300px or 200x300px
+	 *
+	 * @param string $value
+	 *
+	 * @return array
+	 * @since 1.20
+	 */
+	public function parseWidthParam( $value ) {
+		$parsedWidthParam = [];
+		if ( $value === '' ) {
+			return $parsedWidthParam;
+		}
+		$m = [];
+		# (T15500) In both cases (width/height and width only),
+		# permit trailing "px" for backward compatibility.
+		if ( preg_match( '/^([0-9]*)x([0-9]*)\s*(?:px)?\s*$/', $value, $m ) ) {
+			$width = intval( $m[1] );
+			$height = intval( $m[2] );
+			$parsedWidthParam['width'] = $width;
+			$parsedWidthParam['height'] = $height;
+		} elseif ( preg_match( '/^[0-9]*\s*(?:px)?\s*$/', $value ) ) {
+			$width = intval( $value );
+			$parsedWidthParam['width'] = $width;
+		}
+		return $parsedWidthParam;
+	}
 
-			$text = str_replace( "", "", $text );
+	/**
+	 * Lock the current instance of the parser.
+	 *
+	 * This is meant to stop someone from calling the parser
+	 * recursively and messing up all the strip state.
+	 *
+	 * @throws MWException If parser is in a parse
+	 * @return ScopedCallback The lock will be released once the return value goes out of scope.
+	 */
+	protected function lock() {
+		if ( $this->mInParse ) {
+			throw new MWException( "Parser state cleared while parsing. "
+				. "Did you call Parser::parse recursively? Lock is held by: " . $this->mInParse );
 		}
 
-		# Should be good to go.
-		return $text;
-	}
-}
-
-/**
- * @todo document, briefly.
- * @ingroup Parser
- */
-class StripState {
-	var $general, $nowiki;
+		// Save the backtrace when locking, so that if some code tries locking again,
+		// we can print the lock owner's backtrace for easier debugging
+		$e = new Exception;
+		$this->mInParse = $e->getTraceAsString();
 
-	function __construct() {
-		$this->general = new ReplacementArray;
-		$this->nowiki = new ReplacementArray;
-	}
+		$recursiveCheck = new ScopedCallback( function () {
+			$this->mInParse = false;
+		} );
 
-	function unstripGeneral( $text ) {
-		wfProfileIn( __METHOD__ );
-		do {
-			$oldText = $text;
-			$text = $this->general->replace( $text );
-		} while ( $text !== $oldText );
-		wfProfileOut( __METHOD__ );
-		return $text;
+		return $recursiveCheck;
 	}
 
-	function unstripNoWiki( $text ) {
-		wfProfileIn( __METHOD__ );
-		do {
-			$oldText = $text;
-			$text = $this->nowiki->replace( $text );
-		} while ( $text !== $oldText );
-		wfProfileOut( __METHOD__ );
-		return $text;
-	}
+	/**
+	 * Strip outer 
 tag from the HTML source of a single paragraph.
+	 *
+	 * Returns original HTML if the 
 tag has any attributes, if there's no wrapping 
 tag,
+	 * or if there is more than one 
 tag in the input HTML.
+	 *
+	 * @param string $html
+	 * @return string
+	 * @since 1.24
+	 */
+	public static function stripOuterParagraph( $html ) {
+		$m = [];
+		if ( preg_match( '/^
(.*)\n?<\/p>\n?$/sU', $html, $m ) ) {
+			if ( strpos( $m[1], '
' ) === false ) {
+				$html = $m[1];
+			}
+		}
 
-	function unstripBoth( $text ) {
-		wfProfileIn( __METHOD__ );
-		do {
-			$oldText = $text;
-			$text = $this->general->replace( $text );
-			$text = $this->nowiki->replace( $text );
-		} while ( $text !== $oldText );
-		wfProfileOut( __METHOD__ );
-		return $text;
+		return $html;
 	}
-}
-
-/**
- * @todo document, briefly.
- * @ingroup Parser
- */
-class OnlyIncludeReplacer {
-	var $output = '';
 
-	function replace( $matches ) {
-		if ( substr( $matches[1], -1 ) === "\n" ) {
-			$this->output .= substr( $matches[1], 0, -1 );
+	/**
+	 * Return this parser if it is not doing anything, otherwise
+	 * get a fresh parser. You can use this method by doing
+	 * $myParser = $wgParser->getFreshParser(), or more simply
+	 * $wgParser->getFreshParser()->parse( ... );
+	 * if you're unsure if $wgParser is safe to use.
+	 *
+	 * @since 1.24
+	 * @return Parser A parser object that is not parsing anything
+	 */
+	public function getFreshParser() {
+		global $wgParserConf;
+		if ( $this->mInParse ) {
+			return new $wgParserConf['class']( $wgParserConf );
 		} else {
-			$this->output .= $matches[1];
+			return $this;
 		}
 	}
+
+	/**
+	 * Set's up the PHP implementation of OOUI for use in this request
+	 * and instructs OutputPage to enable OOUI for itself.
+	 *
+	 * @since 1.26
+	 */
+	public function enableOOUI() {
+		OutputPage::setupOOUI();
+		$this->mOutput->setEnableOOUI( true );
+	}
 }