Remove Preprocessor_DOM, deprecated in 1.34
Remove the deprecated Preprocessor_DOM class, which was hard-deprecated in 1.34. This begins to simplify parser configuration and reduce redundant code paths, but I've left two things for cleanup in a future patch: 1. The `preprocessorClass` configuration option to the parser, exposed in `$wgParserConf`, ServiceWiring, ParserFactory, etc. There is no reason for this to be exposed as configurable, but I've left this clean up to a future patch. 2. The `$wgMaxGeneratedPPNodeCount` configuration, exposed also in ParserOptions. Only Preprocessor_DOM calculated this count, and since we are only using Preprocessor_Hash now, this configuration has no effect. But since this value was exposed in ParserOptions and elsewhere, I've deprecated where needed but left this clean up to a future patch. Bug: T204945 Change-Id: I727f003f9a42d0c92bcbcce8a8289d5af6cd1298
This commit is contained in:
C. Scott Ananian
parent
ea01e7cfbb
commit
5cbb64f56a
17 changed files with 33 additions and 1983 deletions
|
|
@ -228,6 +228,7 @@ because of Phabricator reports.
|
|||
* ApiBase::checkTitleUserPermissions no longer accepts a User as the third
|
||||
parameter. Passing a user was deprecated in 1.33.
|
||||
* The ParserAfterUnstrip hook was removed without deprecation.
|
||||
* Preprocessor_DOM and related classes, deprecated in 1.34, have been removed.
|
||||
* …
|
||||
|
||||
=== Deprecations in 1.35 ===
|
||||
|
|
|
|||
|
|
@ -1036,7 +1036,6 @@ $wgAutoloadLocalClasses = [
|
|||
'PHPVersionCheck' => __DIR__ . '/includes/PHPVersionCheck.php',
|
||||
'PNGHandler' => __DIR__ . '/includes/media/PNGHandler.php',
|
||||
'PNGMetadataExtractor' => __DIR__ . '/includes/media/PNGMetadataExtractor.php',
|
||||
'PPCustomFrame_DOM' => __DIR__ . '/includes/parser/PPCustomFrame_DOM.php',
|
||||
'PPCustomFrame_Hash' => __DIR__ . '/includes/parser/PPCustomFrame_Hash.php',
|
||||
'PPDPart' => __DIR__ . '/includes/parser/PPDPart.php',
|
||||
'PPDPart_Hash' => __DIR__ . '/includes/parser/PPDPart_Hash.php',
|
||||
|
|
@ -1045,18 +1044,15 @@ $wgAutoloadLocalClasses = [
|
|||
'PPDStackElement_Hash' => __DIR__ . '/includes/parser/PPDStackElement_Hash.php',
|
||||
'PPDStack_Hash' => __DIR__ . '/includes/parser/PPDStack_Hash.php',
|
||||
'PPFrame' => __DIR__ . '/includes/parser/PPFrame.php',
|
||||
'PPFrame_DOM' => __DIR__ . '/includes/parser/PPFrame_DOM.php',
|
||||
'PPFrame_Hash' => __DIR__ . '/includes/parser/PPFrame_Hash.php',
|
||||
'PPFuzzTest' => __DIR__ . '/maintenance/preprocessorFuzzTest.php',
|
||||
'PPFuzzTester' => __DIR__ . '/maintenance/preprocessorFuzzTest.php',
|
||||
'PPFuzzUser' => __DIR__ . '/maintenance/preprocessorFuzzTest.php',
|
||||
'PPNode' => __DIR__ . '/includes/parser/PPNode.php',
|
||||
'PPNode_DOM' => __DIR__ . '/includes/parser/PPNode_DOM.php',
|
||||
'PPNode_Hash_Array' => __DIR__ . '/includes/parser/PPNode_Hash_Array.php',
|
||||
'PPNode_Hash_Attr' => __DIR__ . '/includes/parser/PPNode_Hash_Attr.php',
|
||||
'PPNode_Hash_Text' => __DIR__ . '/includes/parser/PPNode_Hash_Text.php',
|
||||
'PPNode_Hash_Tree' => __DIR__ . '/includes/parser/PPNode_Hash_Tree.php',
|
||||
'PPTemplateFrame_DOM' => __DIR__ . '/includes/parser/PPTemplateFrame_DOM.php',
|
||||
'PPTemplateFrame_Hash' => __DIR__ . '/includes/parser/PPTemplateFrame_Hash.php',
|
||||
'PackedHoverImageGallery' => __DIR__ . '/includes/gallery/PackedHoverImageGallery.php',
|
||||
'PackedImageGallery' => __DIR__ . '/includes/gallery/PackedImageGallery.php',
|
||||
|
|
@ -1124,7 +1120,6 @@ $wgAutoloadLocalClasses = [
|
|||
'PrefixingStatsdDataFactoryProxy' => __DIR__ . '/includes/libs/stats/PrefixingStatsdDataFactoryProxy.php',
|
||||
'PreprocessDump' => __DIR__ . '/maintenance/preprocessDump.php',
|
||||
'Preprocessor' => __DIR__ . '/includes/parser/Preprocessor.php',
|
||||
'Preprocessor_DOM' => __DIR__ . '/includes/parser/Preprocessor_DOM.php',
|
||||
'Preprocessor_Hash' => __DIR__ . '/includes/parser/Preprocessor_Hash.php',
|
||||
'ProcessCacheLRU' => __DIR__ . '/includes/libs/ProcessCacheLRU.php',
|
||||
'Processor' => __DIR__ . '/includes/registration/Processor.php',
|
||||
|
|
|
|||
|
|
@ -4113,16 +4113,14 @@ $wgInvalidRedirectTargets = [ 'Filepath', 'Mypage', 'Mytalk', 'Redirect' ];
|
|||
*
|
||||
* class The class name
|
||||
*
|
||||
* preprocessorClass The preprocessor class. Two classes are currently available:
|
||||
* preprocessorClass The preprocessor class. Only one class is currently available:
|
||||
* Preprocessor_Hash, which uses plain PHP arrays for temporary
|
||||
* storage, and Preprocessor_DOM, which uses the DOM module for
|
||||
* temporary storage. Preprocessor_DOM generally uses less memory;
|
||||
* the speed of the two is roughly the same.
|
||||
* storage.
|
||||
*
|
||||
* If this parameter is not given, it uses Preprocessor_Hash.
|
||||
*
|
||||
* The Preprocessor_DOM class is deprecated, and will be removed in a future
|
||||
* release.
|
||||
* Configuring the parser via preprocessorClass is deprecated, and will be
|
||||
* removed in a future release.
|
||||
*
|
||||
* The entire associative array will be passed through to the constructor as
|
||||
* the first parameter. Note that only Setup.php can use this variable --
|
||||
|
|
@ -4155,6 +4153,9 @@ $wgMaxPPNodeCount = 1000000;
|
|||
* this default corresponds to about 155 MB.
|
||||
*
|
||||
* When the limit is exceeded, an exception is thrown.
|
||||
*
|
||||
* @deprecated since 1.35, Preprocessor_DOM was removed and this option no
|
||||
* longer has any effect.
|
||||
*/
|
||||
$wgMaxGeneratedPPNodeCount = 1000000;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,71 +0,0 @@
|
|||
<?php
|
||||
/**
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
* http://www.gnu.org/copyleft/gpl.html
|
||||
*
|
||||
* @file
|
||||
* @ingroup Parser
|
||||
*/
|
||||
|
||||
/**
|
||||
* Expansion frame with custom arguments
|
||||
* @deprecated since 1.34, use PPCustomFrame_Hash
|
||||
* @ingroup Parser
|
||||
*/
|
||||
// phpcs:ignore Squiz.Classes.ValidClassName.NotCamelCaps
|
||||
class PPCustomFrame_DOM extends PPFrame_DOM {
|
||||
|
||||
public $args;
|
||||
|
||||
public function __construct( $preprocessor, $args ) {
|
||||
parent::__construct( $preprocessor );
|
||||
$this->args = $args;
|
||||
}
|
||||
|
||||
public function __toString() {
|
||||
$s = 'cstmframe{';
|
||||
$first = true;
|
||||
foreach ( $this->args as $name => $value ) {
|
||||
if ( $first ) {
|
||||
$first = false;
|
||||
} else {
|
||||
$s .= ', ';
|
||||
}
|
||||
$s .= "\"$name\":\"" .
|
||||
str_replace( '"', '\\"', $value->__toString() ) . '"';
|
||||
}
|
||||
$s .= '}';
|
||||
return $s;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return bool
|
||||
*/
|
||||
public function isEmpty() {
|
||||
return !count( $this->args );
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int|string $index
|
||||
* @return string|bool
|
||||
*/
|
||||
public function getArgument( $index ) {
|
||||
return $this->args[$index] ?? false;
|
||||
}
|
||||
|
||||
public function getArguments() {
|
||||
return $this->args;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,635 +0,0 @@
|
|||
<?php
|
||||
/**
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
* http://www.gnu.org/copyleft/gpl.html
|
||||
*
|
||||
* @file
|
||||
* @ingroup Parser
|
||||
*/
|
||||
|
||||
/**
|
||||
* An expansion frame, used as a context to expand the result of preprocessToObj()
|
||||
* @deprecated since 1.34, use PPFrame_Hash
|
||||
* @ingroup Parser
|
||||
* @phan-file-suppress PhanUndeclaredMethod
|
||||
*/
|
||||
// phpcs:ignore Squiz.Classes.ValidClassName.NotCamelCaps
|
||||
class PPFrame_DOM implements PPFrame {
|
||||
|
||||
/**
|
||||
* @var Preprocessor
|
||||
*/
|
||||
public $preprocessor;
|
||||
|
||||
/**
|
||||
* @var Parser
|
||||
*/
|
||||
public $parser;
|
||||
|
||||
/**
|
||||
* @var Title
|
||||
*/
|
||||
public $title;
|
||||
public $titleCache;
|
||||
|
||||
/**
|
||||
* Hashtable listing templates which are disallowed for expansion in this frame,
|
||||
* having been encountered previously in parent frames.
|
||||
*/
|
||||
public $loopCheckHash;
|
||||
|
||||
/**
|
||||
* Recursion depth of this frame, top = 0
|
||||
* Note that this is NOT the same as expansion depth in expand()
|
||||
*/
|
||||
public $depth;
|
||||
|
||||
private $volatile = false;
|
||||
private $ttl = null;
|
||||
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
protected $childExpansionCache;
|
||||
|
||||
/**
|
||||
* @param Preprocessor $preprocessor The parent preprocessor
|
||||
*/
|
||||
public function __construct( $preprocessor ) {
|
||||
$this->preprocessor = $preprocessor;
|
||||
$this->parser = $preprocessor->parser;
|
||||
$this->title = $this->parser->getTitle();
|
||||
$this->titleCache = [ $this->title ? $this->title->getPrefixedDBkey() : false ];
|
||||
$this->loopCheckHash = [];
|
||||
$this->depth = 0;
|
||||
$this->childExpansionCache = [];
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new child frame
|
||||
* $args is optionally a multi-root PPNode or array containing the template arguments
|
||||
*
|
||||
* @param bool|array|PPNode_DOM $args
|
||||
* @param Title|bool $title
|
||||
* @param int $indexOffset
|
||||
* @return PPTemplateFrame_DOM
|
||||
*/
|
||||
public function newChild( $args = false, $title = false, $indexOffset = 0 ) {
|
||||
$namedArgs = [];
|
||||
$numberedArgs = [];
|
||||
if ( $title === false ) {
|
||||
$title = $this->title;
|
||||
}
|
||||
if ( $args !== false ) {
|
||||
$xpath = false;
|
||||
if ( $args instanceof PPNode_DOM ) {
|
||||
$args = $args->node;
|
||||
}
|
||||
// @phan-suppress-next-line PhanTypeSuspiciousNonTraversableForeach
|
||||
foreach ( $args as $arg ) {
|
||||
if ( $arg instanceof PPNode_DOM ) {
|
||||
$arg = $arg->node;
|
||||
}
|
||||
if ( !$xpath || $xpath->document !== $arg->ownerDocument ) {
|
||||
$xpath = new DOMXPath( $arg->ownerDocument );
|
||||
}
|
||||
|
||||
$nameNodes = $xpath->query( 'name', $arg );
|
||||
$value = $xpath->query( 'value', $arg );
|
||||
if ( $nameNodes->item( 0 )->hasAttributes() ) {
|
||||
// Numbered parameter
|
||||
$index = $nameNodes->item( 0 )->attributes->getNamedItem( 'index' )->textContent;
|
||||
$index = $index - $indexOffset;
|
||||
if ( isset( $namedArgs[$index] ) || isset( $numberedArgs[$index] ) ) {
|
||||
$this->parser->getOutput()->addWarning( wfMessage( 'duplicate-args-warning',
|
||||
wfEscapeWikiText( $this->title ),
|
||||
wfEscapeWikiText( $title ),
|
||||
wfEscapeWikiText( $index ) )->text() );
|
||||
$this->parser->addTrackingCategory( 'duplicate-args-category' );
|
||||
}
|
||||
$numberedArgs[$index] = $value->item( 0 );
|
||||
unset( $namedArgs[$index] );
|
||||
} else {
|
||||
// Named parameter
|
||||
$name = trim( $this->expand( $nameNodes->item( 0 ), PPFrame::STRIP_COMMENTS ) );
|
||||
if ( isset( $namedArgs[$name] ) || isset( $numberedArgs[$name] ) ) {
|
||||
$this->parser->getOutput()->addWarning( wfMessage( 'duplicate-args-warning',
|
||||
wfEscapeWikiText( $this->title ),
|
||||
wfEscapeWikiText( $title ),
|
||||
wfEscapeWikiText( $name ) )->text() );
|
||||
$this->parser->addTrackingCategory( 'duplicate-args-category' );
|
||||
}
|
||||
$namedArgs[$name] = $value->item( 0 );
|
||||
unset( $numberedArgs[$name] );
|
||||
}
|
||||
}
|
||||
}
|
||||
return new PPTemplateFrame_DOM( $this->preprocessor, $this, $numberedArgs, $namedArgs, $title );
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws MWException
|
||||
* @param string|int $key
|
||||
* @param string|PPNode_DOM|DOMNode|DOMNodeList $root
|
||||
* @param int $flags
|
||||
* @return string
|
||||
*/
|
||||
public function cachedExpand( $key, $root, $flags = 0 ) {
|
||||
// we don't have a parent, so we don't have a cache
|
||||
return $this->expand( $root, $flags );
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws MWException
|
||||
* @param string|PPNode_DOM|DOMNode|DOMNodeList $root
|
||||
* @param int $flags
|
||||
* @return string
|
||||
*/
|
||||
public function expand( $root, $flags = 0 ) {
|
||||
static $expansionDepth = 0;
|
||||
if ( is_string( $root ) ) {
|
||||
return $root;
|
||||
}
|
||||
|
||||
if ( ++$this->parser->mPPNodeCount > $this->parser->mOptions->getMaxPPNodeCount() ) {
|
||||
$this->parser->limitationWarn( 'node-count-exceeded',
|
||||
$this->parser->mPPNodeCount,
|
||||
$this->parser->mOptions->getMaxPPNodeCount()
|
||||
);
|
||||
return '<span class="error">Node-count limit exceeded</span>';
|
||||
}
|
||||
|
||||
if ( $expansionDepth > $this->parser->mOptions->getMaxPPExpandDepth() ) {
|
||||
$this->parser->limitationWarn( 'expansion-depth-exceeded',
|
||||
$expansionDepth,
|
||||
$this->parser->mOptions->getMaxPPExpandDepth()
|
||||
);
|
||||
return '<span class="error">Expansion depth limit exceeded</span>';
|
||||
}
|
||||
++$expansionDepth;
|
||||
if ( $expansionDepth > $this->parser->mHighestExpansionDepth ) {
|
||||
$this->parser->mHighestExpansionDepth = $expansionDepth;
|
||||
}
|
||||
|
||||
if ( $root instanceof PPNode_DOM ) {
|
||||
$root = $root->node;
|
||||
}
|
||||
if ( $root instanceof DOMDocument ) {
|
||||
$root = $root->documentElement;
|
||||
}
|
||||
|
||||
$outStack = [ '', '' ];
|
||||
$iteratorStack = [ false, $root ];
|
||||
$indexStack = [ 0, 0 ];
|
||||
|
||||
while ( count( $iteratorStack ) > 1 ) {
|
||||
$level = count( $outStack ) - 1;
|
||||
$iteratorNode =& $iteratorStack[$level];
|
||||
$out =& $outStack[$level];
|
||||
$index =& $indexStack[$level];
|
||||
|
||||
if ( $iteratorNode instanceof PPNode_DOM ) {
|
||||
$iteratorNode = $iteratorNode->node;
|
||||
}
|
||||
|
||||
if ( is_array( $iteratorNode ) ) {
|
||||
if ( $index >= count( $iteratorNode ) ) {
|
||||
// All done with this iterator
|
||||
$iteratorStack[$level] = false;
|
||||
$contextNode = false;
|
||||
} else {
|
||||
$contextNode = $iteratorNode[$index];
|
||||
$index++;
|
||||
}
|
||||
} elseif ( $iteratorNode instanceof DOMNodeList ) {
|
||||
if ( $index >= $iteratorNode->length ) {
|
||||
// All done with this iterator
|
||||
$iteratorStack[$level] = false;
|
||||
$contextNode = false;
|
||||
} else {
|
||||
$contextNode = $iteratorNode->item( $index );
|
||||
$index++;
|
||||
}
|
||||
} else {
|
||||
// Copy to $contextNode and then delete from iterator stack,
|
||||
// because this is not an iterator but we do have to execute it once
|
||||
$contextNode = $iteratorStack[$level];
|
||||
$iteratorStack[$level] = false;
|
||||
}
|
||||
|
||||
if ( $contextNode instanceof PPNode_DOM ) {
|
||||
$contextNode = $contextNode->node;
|
||||
}
|
||||
|
||||
$newIterator = false;
|
||||
|
||||
if ( $contextNode === false ) {
|
||||
// nothing to do
|
||||
} elseif ( is_string( $contextNode ) ) {
|
||||
$out .= $contextNode;
|
||||
} elseif ( is_array( $contextNode ) || $contextNode instanceof DOMNodeList ) {
|
||||
$newIterator = $contextNode;
|
||||
} elseif ( $contextNode instanceof DOMNode ) {
|
||||
if ( $contextNode->nodeType == XML_TEXT_NODE ) {
|
||||
$out .= $contextNode->nodeValue;
|
||||
} elseif ( $contextNode->nodeName == 'template' ) {
|
||||
# Double-brace expansion
|
||||
$xpath = new DOMXPath( $contextNode->ownerDocument );
|
||||
$titles = $xpath->query( 'title', $contextNode );
|
||||
$title = $titles->item( 0 );
|
||||
$parts = $xpath->query( 'part', $contextNode );
|
||||
if ( $flags & PPFrame::NO_TEMPLATES ) {
|
||||
$newIterator = $this->virtualBracketedImplode( '{{', '|', '}}', $title, $parts );
|
||||
} else {
|
||||
$lineStart = $contextNode->getAttribute( 'lineStart' );
|
||||
$params = [
|
||||
'title' => new PPNode_DOM( $title ),
|
||||
'parts' => new PPNode_DOM( $parts ),
|
||||
'lineStart' => $lineStart ];
|
||||
$ret = $this->parser->braceSubstitution( $params, $this );
|
||||
if ( isset( $ret['object'] ) ) {
|
||||
$newIterator = $ret['object'];
|
||||
} else {
|
||||
$out .= $ret['text'];
|
||||
}
|
||||
}
|
||||
} elseif ( $contextNode->nodeName == 'tplarg' ) {
|
||||
# Triple-brace expansion
|
||||
$xpath = new DOMXPath( $contextNode->ownerDocument );
|
||||
$titles = $xpath->query( 'title', $contextNode );
|
||||
$title = $titles->item( 0 );
|
||||
$parts = $xpath->query( 'part', $contextNode );
|
||||
if ( $flags & PPFrame::NO_ARGS ) {
|
||||
$newIterator = $this->virtualBracketedImplode( '{{{', '|', '}}}', $title, $parts );
|
||||
} else {
|
||||
$params = [
|
||||
'title' => new PPNode_DOM( $title ),
|
||||
'parts' => new PPNode_DOM( $parts ) ];
|
||||
$ret = $this->parser->argSubstitution( $params, $this );
|
||||
if ( isset( $ret['object'] ) ) {
|
||||
$newIterator = $ret['object'];
|
||||
} else {
|
||||
$out .= $ret['text'];
|
||||
}
|
||||
}
|
||||
} elseif ( $contextNode->nodeName == 'comment' ) {
|
||||
# HTML-style comment
|
||||
# Remove it in HTML, pre+remove and STRIP_COMMENTS modes
|
||||
# Not in RECOVER_COMMENTS mode (msgnw) though.
|
||||
if ( ( $this->parser->ot['html']
|
||||
|| ( $this->parser->ot['pre'] && $this->parser->mOptions->getRemoveComments() )
|
||||
|| ( $flags & PPFrame::STRIP_COMMENTS )
|
||||
) && !( $flags & PPFrame::RECOVER_COMMENTS )
|
||||
) {
|
||||
$out .= '';
|
||||
} elseif ( $this->parser->ot['wiki'] && !( $flags & PPFrame::RECOVER_COMMENTS ) ) {
|
||||
# Add a strip marker in PST mode so that pstPass2() can
|
||||
# run some old-fashioned regexes on the result.
|
||||
# Not in RECOVER_COMMENTS mode (extractSections) though.
|
||||
$out .= $this->parser->insertStripItem( $contextNode->textContent );
|
||||
} else {
|
||||
# Recover the literal comment in RECOVER_COMMENTS and pre+no-remove
|
||||
$out .= $contextNode->textContent;
|
||||
}
|
||||
} elseif ( $contextNode->nodeName == 'ignore' ) {
|
||||
# Output suppression used by <includeonly> etc.
|
||||
# OT_WIKI will only respect <ignore> in substed templates.
|
||||
# The other output types respect it unless NO_IGNORE is set.
|
||||
# extractSections() sets NO_IGNORE and so never respects it.
|
||||
if ( ( !isset( $this->parent ) && $this->parser->ot['wiki'] )
|
||||
|| ( $flags & PPFrame::NO_IGNORE )
|
||||
) {
|
||||
$out .= $contextNode->textContent;
|
||||
} else {
|
||||
$out .= '';
|
||||
}
|
||||
} elseif ( $contextNode->nodeName == 'ext' ) {
|
||||
# Extension tag
|
||||
$xpath = new DOMXPath( $contextNode->ownerDocument );
|
||||
$names = $xpath->query( 'name', $contextNode );
|
||||
$attrs = $xpath->query( 'attr', $contextNode );
|
||||
$inners = $xpath->query( 'inner', $contextNode );
|
||||
$closes = $xpath->query( 'close', $contextNode );
|
||||
if ( $flags & PPFrame::NO_TAGS ) {
|
||||
$s = '<' . $this->expand( $names->item( 0 ), $flags );
|
||||
if ( $attrs->length > 0 ) {
|
||||
$s .= $this->expand( $attrs->item( 0 ), $flags );
|
||||
}
|
||||
if ( $inners->length > 0 ) {
|
||||
$s .= '>' . $this->expand( $inners->item( 0 ), $flags );
|
||||
if ( $closes->length > 0 ) {
|
||||
$s .= $this->expand( $closes->item( 0 ), $flags );
|
||||
}
|
||||
} else {
|
||||
$s .= '/>';
|
||||
}
|
||||
$out .= $s;
|
||||
} else {
|
||||
$params = [
|
||||
'name' => new PPNode_DOM( $names->item( 0 ) ),
|
||||
'attr' => $attrs->length > 0 ? new PPNode_DOM( $attrs->item( 0 ) ) : null,
|
||||
'inner' => $inners->length > 0 ? new PPNode_DOM( $inners->item( 0 ) ) : null,
|
||||
'close' => $closes->length > 0 ? new PPNode_DOM( $closes->item( 0 ) ) : null,
|
||||
];
|
||||
$out .= $this->parser->extensionSubstitution( $params, $this );
|
||||
}
|
||||
} elseif ( $contextNode->nodeName == 'h' ) {
|
||||
# Heading
|
||||
$s = $this->expand( $contextNode->childNodes, $flags );
|
||||
|
||||
# Insert a heading marker only for <h> children of <root>
|
||||
# This is to stop extractSections from going over multiple tree levels
|
||||
if ( $contextNode->parentNode->nodeName == 'root' && $this->parser->ot['html'] ) {
|
||||
# Insert heading index marker
|
||||
$headingIndex = $contextNode->getAttribute( 'i' );
|
||||
$titleText = $this->title->getPrefixedDBkey();
|
||||
$this->parser->mHeadings[] = [ $titleText, $headingIndex ];
|
||||
$serial = count( $this->parser->mHeadings ) - 1;
|
||||
$marker = Parser::MARKER_PREFIX . "-h-$serial-" . Parser::MARKER_SUFFIX;
|
||||
$count = $contextNode->getAttribute( 'level' );
|
||||
$s = substr( $s, 0, $count ) . $marker . substr( $s, $count );
|
||||
$this->parser->mStripState->addGeneral( $marker, '' );
|
||||
}
|
||||
$out .= $s;
|
||||
} else {
|
||||
# Generic recursive expansion
|
||||
$newIterator = $contextNode->childNodes;
|
||||
}
|
||||
} else {
|
||||
throw new MWException( __METHOD__ . ': Invalid parameter type' );
|
||||
}
|
||||
|
||||
if ( $newIterator !== false ) {
|
||||
if ( $newIterator instanceof PPNode_DOM ) {
|
||||
$newIterator = $newIterator->node;
|
||||
}
|
||||
$outStack[] = '';
|
||||
$iteratorStack[] = $newIterator;
|
||||
$indexStack[] = 0;
|
||||
} elseif ( $iteratorStack[$level] === false ) {
|
||||
// Return accumulated value to parent
|
||||
// With tail recursion
|
||||
while ( $iteratorStack[$level] === false && $level > 0 ) {
|
||||
$outStack[$level - 1] .= $out;
|
||||
array_pop( $outStack );
|
||||
array_pop( $iteratorStack );
|
||||
array_pop( $indexStack );
|
||||
$level--;
|
||||
}
|
||||
}
|
||||
}
|
||||
--$expansionDepth;
|
||||
return $outStack[0];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $sep
|
||||
* @param int $flags
|
||||
* @param string|PPNode_DOM|DOMNode ...$args
|
||||
* @return string
|
||||
*/
|
||||
public function implodeWithFlags( $sep, $flags, ...$args ) {
|
||||
$first = true;
|
||||
$s = '';
|
||||
foreach ( $args as $root ) {
|
||||
if ( $root instanceof PPNode_DOM ) {
|
||||
$root = $root->node;
|
||||
}
|
||||
if ( !is_array( $root ) && !( $root instanceof DOMNodeList ) ) {
|
||||
$root = [ $root ];
|
||||
}
|
||||
foreach ( $root as $node ) {
|
||||
if ( $first ) {
|
||||
$first = false;
|
||||
} else {
|
||||
$s .= $sep;
|
||||
}
|
||||
$s .= $this->expand( $node, $flags );
|
||||
}
|
||||
}
|
||||
return $s;
|
||||
}
|
||||
|
||||
/**
|
||||
* Implode with no flags specified
|
||||
* This previously called implodeWithFlags but has now been inlined to reduce stack depth
|
||||
*
|
||||
* @param string $sep
|
||||
* @param string|PPNode_DOM|DOMNode ...$args
|
||||
* @return string
|
||||
*/
|
||||
public function implode( $sep, ...$args ) {
|
||||
$first = true;
|
||||
$s = '';
|
||||
foreach ( $args as $root ) {
|
||||
if ( $root instanceof PPNode_DOM ) {
|
||||
$root = $root->node;
|
||||
}
|
||||
if ( !is_array( $root ) && !( $root instanceof DOMNodeList ) ) {
|
||||
$root = [ $root ];
|
||||
}
|
||||
foreach ( $root as $node ) {
|
||||
if ( $first ) {
|
||||
$first = false;
|
||||
} else {
|
||||
$s .= $sep;
|
||||
}
|
||||
$s .= $this->expand( $node );
|
||||
}
|
||||
}
|
||||
return $s;
|
||||
}
|
||||
|
||||
/**
|
||||
* Makes an object that, when expand()ed, will be the same as one obtained
|
||||
* with implode()
|
||||
*
|
||||
* @param string $sep
|
||||
* @param string|PPNode_DOM|DOMNode ...$args
|
||||
* @return array
|
||||
* @suppress PhanParamSignatureMismatch
|
||||
*/
|
||||
public function virtualImplode( $sep, ...$args ) {
|
||||
$out = [];
|
||||
$first = true;
|
||||
|
||||
foreach ( $args as $root ) {
|
||||
if ( $root instanceof PPNode_DOM ) {
|
||||
$root = $root->node;
|
||||
}
|
||||
if ( !is_array( $root ) && !( $root instanceof DOMNodeList ) ) {
|
||||
$root = [ $root ];
|
||||
}
|
||||
foreach ( $root as $node ) {
|
||||
if ( $first ) {
|
||||
$first = false;
|
||||
} else {
|
||||
$out[] = $sep;
|
||||
}
|
||||
$out[] = $node;
|
||||
}
|
||||
}
|
||||
return $out;
|
||||
}
|
||||
|
||||
/**
|
||||
* Virtual implode with brackets
|
||||
* @param string $start
|
||||
* @param string $sep
|
||||
* @param string $end
|
||||
* @param string|PPNode_DOM|DOMNode ...$args
|
||||
* @return array
|
||||
* @suppress PhanParamSignatureMismatch
|
||||
*/
|
||||
public function virtualBracketedImplode( $start, $sep, $end, ...$args ) {
|
||||
$out = [ $start ];
|
||||
$first = true;
|
||||
|
||||
foreach ( $args as $root ) {
|
||||
if ( $root instanceof PPNode_DOM ) {
|
||||
$root = $root->node;
|
||||
}
|
||||
if ( !is_array( $root ) && !( $root instanceof DOMNodeList ) ) {
|
||||
$root = [ $root ];
|
||||
}
|
||||
foreach ( $root as $node ) {
|
||||
if ( $first ) {
|
||||
$first = false;
|
||||
} else {
|
||||
$out[] = $sep;
|
||||
}
|
||||
$out[] = $node;
|
||||
}
|
||||
}
|
||||
$out[] = $end;
|
||||
return $out;
|
||||
}
|
||||
|
||||
public function __toString() {
|
||||
return 'frame{}';
|
||||
}
|
||||
|
||||
public function getPDBK( $level = false ) {
|
||||
if ( $level === false ) {
|
||||
return $this->title->getPrefixedDBkey();
|
||||
} else {
|
||||
return $this->titleCache[$level] ?? false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function getArguments() {
|
||||
return [];
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function getNumberedArguments() {
|
||||
return [];
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function getNamedArguments() {
|
||||
return [];
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if there are no arguments in this frame
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isEmpty() {
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int|string $name
|
||||
* @return bool Always false in this implementation.
|
||||
*/
|
||||
public function getArgument( $name ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if the infinite loop check is OK, false if a loop is detected
|
||||
*
|
||||
* @param Title $title
|
||||
* @return bool
|
||||
*/
|
||||
public function loopCheck( $title ) {
|
||||
return !isset( $this->loopCheckHash[$title->getPrefixedDBkey()] );
|
||||
}
|
||||
|
||||
/**
|
||||
* Return true if the frame is a template frame
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isTemplate() {
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a title of frame
|
||||
*
|
||||
* @return Title
|
||||
*/
|
||||
public function getTitle() {
|
||||
return $this->title;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the volatile flag
|
||||
*
|
||||
* @param bool $flag
|
||||
*/
|
||||
public function setVolatile( $flag = true ) {
|
||||
$this->volatile = $flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the volatile flag
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isVolatile() {
|
||||
return $this->volatile;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the TTL
|
||||
*
|
||||
* @param int $ttl
|
||||
*/
|
||||
public function setTTL( $ttl ) {
|
||||
if ( $ttl !== null && ( $this->ttl === null || $ttl < $this->ttl ) ) {
|
||||
$this->ttl = $ttl;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the TTL
|
||||
*
|
||||
* @return int|null
|
||||
*/
|
||||
public function getTTL() {
|
||||
return $this->ttl;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,190 +0,0 @@
|
|||
<?php
|
||||
/**
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
* http://www.gnu.org/copyleft/gpl.html
|
||||
*
|
||||
* @file
|
||||
* @ingroup Parser
|
||||
*/
|
||||
|
||||
/**
|
||||
* @deprecated since 1.34, use PPNode_Hash_{Tree,Text,Array,Attr}
|
||||
* @ingroup Parser
|
||||
* @phan-file-suppress PhanUndeclaredMethod
|
||||
*/
|
||||
// phpcs:ignore Squiz.Classes.ValidClassName.NotCamelCaps
|
||||
class PPNode_DOM implements PPNode {
|
||||
|
||||
/**
|
||||
* @var DOMElement|DOMNodeList
|
||||
*/
|
||||
public $node;
|
||||
public $xpath;
|
||||
|
||||
public function __construct( $node, $xpath = false ) {
|
||||
$this->node = $node;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return DOMXPath
|
||||
*/
|
||||
public function getXPath() {
|
||||
if ( $this->xpath === null ) {
|
||||
$this->xpath = new DOMXPath( $this->node->ownerDocument );
|
||||
}
|
||||
return $this->xpath;
|
||||
}
|
||||
|
||||
public function __toString() {
|
||||
if ( $this->node instanceof DOMNodeList ) {
|
||||
$s = '';
|
||||
foreach ( $this->node as $node ) {
|
||||
$s .= $node->ownerDocument->saveXML( $node );
|
||||
}
|
||||
} else {
|
||||
$s = $this->node->ownerDocument->saveXML( $this->node );
|
||||
}
|
||||
return $s;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return false|PPNode_DOM
|
||||
*/
|
||||
public function getChildren() {
|
||||
return $this->node->childNodes ? new self( $this->node->childNodes ) : false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return false|PPNode_DOM
|
||||
*/
|
||||
public function getFirstChild() {
|
||||
return $this->node->firstChild ? new self( $this->node->firstChild ) : false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return false|PPNode_DOM
|
||||
*/
|
||||
public function getNextSibling() {
|
||||
return $this->node->nextSibling ? new self( $this->node->nextSibling ) : false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $type
|
||||
*
|
||||
* @return false|PPNode_DOM
|
||||
*/
|
||||
public function getChildrenOfType( $type ) {
|
||||
return new self( $this->getXPath()->query( $type, $this->node ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* @return int
|
||||
*/
|
||||
public function getLength() {
|
||||
if ( $this->node instanceof DOMNodeList ) {
|
||||
return $this->node->length;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int $i
|
||||
* @return bool|PPNode_DOM
|
||||
*/
|
||||
public function item( $i ) {
|
||||
$item = $this->node->item( $i );
|
||||
return $item ? new self( $item ) : false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function getName() {
|
||||
if ( $this->node instanceof DOMNodeList ) {
|
||||
return '#nodelist';
|
||||
} else {
|
||||
return $this->node->nodeName;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Split a "<part>" node into an associative array containing:
|
||||
* - name PPNode name
|
||||
* - index String index
|
||||
* - value PPNode value
|
||||
*
|
||||
* @throws MWException
|
||||
* @return array
|
||||
*/
|
||||
public function splitArg() {
|
||||
$xpath = $this->getXPath();
|
||||
$names = $xpath->query( 'name', $this->node );
|
||||
$values = $xpath->query( 'value', $this->node );
|
||||
if ( !$names->length || !$values->length ) {
|
||||
throw new MWException( 'Invalid brace node passed to ' . __METHOD__ );
|
||||
}
|
||||
$name = $names->item( 0 );
|
||||
$index = $name->getAttribute( 'index' );
|
||||
return [
|
||||
'name' => new self( $name ),
|
||||
'index' => $index,
|
||||
'value' => new self( $values->item( 0 ) ) ];
|
||||
}
|
||||
|
||||
/**
|
||||
* Split an "<ext>" node into an associative array containing name, attr, inner and close
|
||||
* All values in the resulting array are PPNodes. Inner and close are optional.
|
||||
*
|
||||
* @throws MWException
|
||||
* @return array
|
||||
*/
|
||||
public function splitExt() {
|
||||
$xpath = $this->getXPath();
|
||||
$names = $xpath->query( 'name', $this->node );
|
||||
$attrs = $xpath->query( 'attr', $this->node );
|
||||
$inners = $xpath->query( 'inner', $this->node );
|
||||
$closes = $xpath->query( 'close', $this->node );
|
||||
if ( !$names->length || !$attrs->length ) {
|
||||
throw new MWException( 'Invalid ext node passed to ' . __METHOD__ );
|
||||
}
|
||||
$parts = [
|
||||
'name' => new self( $names->item( 0 ) ),
|
||||
'attr' => new self( $attrs->item( 0 ) ) ];
|
||||
if ( $inners->length ) {
|
||||
$parts['inner'] = new self( $inners->item( 0 ) );
|
||||
}
|
||||
if ( $closes->length ) {
|
||||
$parts['close'] = new self( $closes->item( 0 ) );
|
||||
}
|
||||
return $parts;
|
||||
}
|
||||
|
||||
/**
|
||||
* Split a "<h>" node
|
||||
* @throws MWException
|
||||
* @return array
|
||||
*/
|
||||
public function splitHeading() {
|
||||
if ( $this->getName() !== 'h' ) {
|
||||
throw new MWException( 'Invalid h node passed to ' . __METHOD__ );
|
||||
}
|
||||
return [
|
||||
'i' => $this->node->getAttribute( 'i' ),
|
||||
'level' => $this->node->getAttribute( 'level' ),
|
||||
'contents' => $this->getChildren()
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
@ -1,199 +0,0 @@
|
|||
<?php
|
||||
/**
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
* http://www.gnu.org/copyleft/gpl.html
|
||||
*
|
||||
* @file
|
||||
* @ingroup Parser
|
||||
*/
|
||||
|
||||
/**
|
||||
* Expansion frame with template arguments
|
||||
* @deprecated since 1.34, use PPTemplateFrame_Hash
|
||||
* @ingroup Parser
|
||||
*/
|
||||
// phpcs:ignore Squiz.Classes.ValidClassName.NotCamelCaps
|
||||
class PPTemplateFrame_DOM extends PPFrame_DOM {
|
||||
|
||||
public $numberedArgs, $namedArgs;
|
||||
|
||||
/**
|
||||
* @var PPFrame_DOM
|
||||
*/
|
||||
public $parent;
|
||||
public $numberedExpansionCache, $namedExpansionCache;
|
||||
|
||||
/**
|
||||
* @param Preprocessor $preprocessor
|
||||
* @param bool|PPFrame_DOM $parent
|
||||
* @param array $numberedArgs
|
||||
* @param array $namedArgs
|
||||
* @param bool|Title $title
|
||||
*/
|
||||
public function __construct( $preprocessor, $parent = false, $numberedArgs = [],
|
||||
$namedArgs = [], $title = false
|
||||
) {
|
||||
parent::__construct( $preprocessor );
|
||||
|
||||
$this->parent = $parent;
|
||||
$this->numberedArgs = $numberedArgs;
|
||||
$this->namedArgs = $namedArgs;
|
||||
$this->title = $title;
|
||||
$pdbk = $title ? $title->getPrefixedDBkey() : false;
|
||||
$this->titleCache = $parent->titleCache;
|
||||
$this->titleCache[] = $pdbk;
|
||||
$this->loopCheckHash = /*clone*/ $parent->loopCheckHash;
|
||||
if ( $pdbk !== false ) {
|
||||
$this->loopCheckHash[$pdbk] = true;
|
||||
}
|
||||
$this->depth = $parent->depth + 1;
|
||||
$this->numberedExpansionCache = $this->namedExpansionCache = [];
|
||||
}
|
||||
|
||||
public function __toString() {
|
||||
$s = 'tplframe{';
|
||||
$first = true;
|
||||
$args = $this->numberedArgs + $this->namedArgs;
|
||||
foreach ( $args as $name => $value ) {
|
||||
if ( $first ) {
|
||||
$first = false;
|
||||
} else {
|
||||
$s .= ', ';
|
||||
}
|
||||
$s .= "\"$name\":\"" .
|
||||
str_replace( '"', '\\"', $value->ownerDocument->saveXML( $value ) ) . '"';
|
||||
}
|
||||
$s .= '}';
|
||||
return $s;
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws MWException
|
||||
* @param string|int $key
|
||||
* @param string|PPNode_DOM|DOMDocument $root
|
||||
* @param int $flags
|
||||
* @return string
|
||||
*/
|
||||
public function cachedExpand( $key, $root, $flags = 0 ) {
|
||||
if ( isset( $this->parent->childExpansionCache[$key] ) ) {
|
||||
return $this->parent->childExpansionCache[$key];
|
||||
}
|
||||
$retval = $this->expand( $root, $flags );
|
||||
if ( !$this->isVolatile() ) {
|
||||
$this->parent->childExpansionCache[$key] = $retval;
|
||||
}
|
||||
return $retval;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if there are no arguments in this frame
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isEmpty() {
|
||||
return !count( $this->numberedArgs ) && !count( $this->namedArgs );
|
||||
}
|
||||
|
||||
public function getArguments() {
|
||||
$arguments = [];
|
||||
foreach ( array_merge(
|
||||
array_keys( $this->numberedArgs ),
|
||||
array_keys( $this->namedArgs ) ) as $key ) {
|
||||
$arguments[$key] = $this->getArgument( $key );
|
||||
}
|
||||
return $arguments;
|
||||
}
|
||||
|
||||
public function getNumberedArguments() {
|
||||
$arguments = [];
|
||||
foreach ( array_keys( $this->numberedArgs ) as $key ) {
|
||||
$arguments[$key] = $this->getArgument( $key );
|
||||
}
|
||||
return $arguments;
|
||||
}
|
||||
|
||||
public function getNamedArguments() {
|
||||
$arguments = [];
|
||||
foreach ( array_keys( $this->namedArgs ) as $key ) {
|
||||
$arguments[$key] = $this->getArgument( $key );
|
||||
}
|
||||
return $arguments;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int $index
|
||||
* @return string|bool
|
||||
*/
|
||||
public function getNumberedArgument( $index ) {
|
||||
if ( !isset( $this->numberedArgs[$index] ) ) {
|
||||
return false;
|
||||
}
|
||||
if ( !isset( $this->numberedExpansionCache[$index] ) ) {
|
||||
# No trimming for unnamed arguments
|
||||
$this->numberedExpansionCache[$index] = $this->parent->expand(
|
||||
$this->numberedArgs[$index],
|
||||
PPFrame::STRIP_COMMENTS
|
||||
);
|
||||
}
|
||||
return $this->numberedExpansionCache[$index];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $name
|
||||
* @return string|bool
|
||||
*/
|
||||
public function getNamedArgument( $name ) {
|
||||
if ( !isset( $this->namedArgs[$name] ) ) {
|
||||
return false;
|
||||
}
|
||||
if ( !isset( $this->namedExpansionCache[$name] ) ) {
|
||||
# Trim named arguments post-expand, for backwards compatibility
|
||||
$this->namedExpansionCache[$name] = trim(
|
||||
$this->parent->expand( $this->namedArgs[$name], PPFrame::STRIP_COMMENTS ) );
|
||||
}
|
||||
return $this->namedExpansionCache[$name];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int|string $name
|
||||
* @return string|bool
|
||||
*/
|
||||
public function getArgument( $name ) {
|
||||
$text = $this->getNumberedArgument( $name );
|
||||
if ( $text === false ) {
|
||||
$text = $this->getNamedArgument( $name );
|
||||
}
|
||||
return $text;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return true if the frame is a template frame
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isTemplate() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public function setVolatile( $flag = true ) {
|
||||
parent::setVolatile( $flag );
|
||||
$this->parent->setVolatile( $flag );
|
||||
}
|
||||
|
||||
public function setTTL( $ttl ) {
|
||||
parent::setTTL( $ttl );
|
||||
$this->parent->setTTL( $ttl );
|
||||
}
|
||||
}
|
||||
|
|
@ -88,7 +88,7 @@ class Parser {
|
|||
# Everything except bracket, space, or control characters
|
||||
# \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
|
||||
# \x{FFFD} is the Unicode replacement character, which the HTML5 spec
|
||||
# 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
|
||||
|
|
@ -201,7 +201,13 @@ class Parser {
|
|||
public $mLinkHolders;
|
||||
|
||||
public $mLinkID;
|
||||
public $mIncludeSizes, $mPPNodeCount, $mGeneratedPPNodeCount, $mHighestExpansionDepth;
|
||||
public $mIncludeSizes, $mPPNodeCount;
|
||||
/**
|
||||
* @deprecated since 1.35, Preprocessor_DOM was removed and this counter
|
||||
* is no longer incremented by anything.
|
||||
*/
|
||||
public $mGeneratedPPNodeCount;
|
||||
public $mHighestExpansionDepth;
|
||||
public $mDefaultSort;
|
||||
public $mTplRedirCache, $mHeadings, $mDoubleUnderscores;
|
||||
public $mExpensiveFunctionCount; # number of expensive parser function calls
|
||||
|
|
|
|||
|
|
@ -377,6 +377,8 @@ class ParserOptions {
|
|||
/**
|
||||
* Maximum number of nodes generated by Preprocessor::preprocessToObj()
|
||||
* @return int
|
||||
* @deprecated since 1.35, Preprocessor_DOM was removed and this option
|
||||
* no longer has any effect.
|
||||
*/
|
||||
public function getMaxGeneratedPPNodeCount() {
|
||||
return $this->getOption( 'maxGeneratedPPNodeCount' );
|
||||
|
|
@ -386,6 +388,8 @@ class ParserOptions {
|
|||
* Maximum number of nodes generated by Preprocessor::preprocessToObj()
|
||||
* @param int|null $x New value (null is no change)
|
||||
* @return int
|
||||
* @deprecated since 1.35, Preprocessor_DOM was removed and this option
|
||||
* no longer has any effect.
|
||||
*/
|
||||
public function setMaxGeneratedPPNodeCount( $x ) {
|
||||
return $this->setOptionLegacy( 'maxGeneratedPPNodeCount', $x );
|
||||
|
|
|
|||
|
|
@ -1,830 +0,0 @@
|
|||
<?php
|
||||
/**
|
||||
* Preprocessor using PHP's dom extension
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
* http://www.gnu.org/copyleft/gpl.html
|
||||
*
|
||||
* @file
|
||||
* @ingroup Parser
|
||||
* @deprecated since 1.34, use Preprocessor_Hash
|
||||
*/
|
||||
|
||||
/**
|
||||
* @ingroup Parser
|
||||
*/
|
||||
// phpcs:ignore Squiz.Classes.ValidClassName.NotCamelCaps
|
||||
class Preprocessor_DOM extends Preprocessor {
|
||||
|
||||
/**
|
||||
* @var Parser
|
||||
*/
|
||||
public $parser;
|
||||
|
||||
public $memoryLimit;
|
||||
|
||||
const CACHE_PREFIX = 'preprocess-xml';
|
||||
|
||||
/**
|
||||
* @param Parser $parser
|
||||
*/
|
||||
public function __construct( $parser ) {
|
||||
wfDeprecated( __METHOD__, '1.34' ); // T204945
|
||||
$this->parser = $parser;
|
||||
$mem = ini_get( 'memory_limit' );
|
||||
$this->memoryLimit = false;
|
||||
if ( $mem > 0 ) {
|
||||
if ( ctype_digit( (string)$mem ) ) {
|
||||
$this->memoryLimit = (int)$mem;
|
||||
} elseif ( preg_match( '/^(\d+)M$/i', $mem, $m ) ) {
|
||||
$this->memoryLimit = $m[1] * 1048576;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return PPFrame_DOM
|
||||
*/
|
||||
public function newFrame() {
|
||||
return new PPFrame_DOM( $this );
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array $args
|
||||
* @return PPCustomFrame_DOM
|
||||
*/
|
||||
public function newCustomFrame( $args ) {
|
||||
return new PPCustomFrame_DOM( $this, $args );
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array $values
|
||||
* @return PPNode_DOM
|
||||
* @throws MWException
|
||||
*/
|
||||
public function newPartNodeArray( $values ) {
|
||||
// NOTE: DOM manipulation is slower than building & parsing XML! (or so Tim sais)
|
||||
$xml = "<list>";
|
||||
|
||||
foreach ( $values as $k => $val ) {
|
||||
if ( is_int( $k ) ) {
|
||||
$xml .= "<part><name index=\"$k\"/><value>"
|
||||
. htmlspecialchars( $val ) . "</value></part>";
|
||||
} else {
|
||||
$xml .= "<part><name>" . htmlspecialchars( $k )
|
||||
. "</name>=<value>" . htmlspecialchars( $val ) . "</value></part>";
|
||||
}
|
||||
}
|
||||
|
||||
$xml .= "</list>";
|
||||
|
||||
$dom = new DOMDocument();
|
||||
Wikimedia\suppressWarnings();
|
||||
$result = $dom->loadXML( $xml );
|
||||
Wikimedia\restoreWarnings();
|
||||
if ( !$result ) {
|
||||
// Try running the XML through UtfNormal to get rid of invalid characters
|
||||
$xml = UtfNormal\Validator::cleanUp( $xml );
|
||||
// 1 << 19 == XML_PARSE_HUGE, needed so newer versions of libxml2
|
||||
// don't barf when the XML is >256 levels deep
|
||||
$result = $dom->loadXML( $xml, 1 << 19 );
|
||||
}
|
||||
|
||||
if ( !$result ) {
|
||||
throw new MWException( 'Parameters passed to ' . __METHOD__ . ' result in invalid XML' );
|
||||
}
|
||||
|
||||
$root = $dom->documentElement;
|
||||
$node = new PPNode_DOM( $root->childNodes );
|
||||
return $node;
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws MWException
|
||||
* @return bool
|
||||
*/
|
||||
public function memCheck() {
|
||||
if ( $this->memoryLimit === false ) {
|
||||
return true;
|
||||
}
|
||||
$usage = memory_get_usage();
|
||||
if ( $usage > $this->memoryLimit * 0.9 ) {
|
||||
$limit = intval( $this->memoryLimit * 0.9 / 1048576 + 0.5 );
|
||||
throw new MWException( "Preprocessor hit 90% memory limit ($limit MB)" );
|
||||
}
|
||||
return $usage <= $this->memoryLimit * 0.8;
|
||||
}
|
||||
|
||||
/**
|
||||
* Preprocess some wikitext and return the document tree.
|
||||
* This is the ghost of Parser::replace_variables().
|
||||
*
|
||||
* @param string $text The text to parse
|
||||
* @param int $flags Bitwise combination of:
|
||||
* Parser::PTD_FOR_INCLUSION Handle "<noinclude>" and "<includeonly>"
|
||||
* 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 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
|
||||
* in the section edit link and thus back to extractSections().
|
||||
*
|
||||
* The output of this function is currently only cached in process memory, but a persistent
|
||||
* cache may be implemented at a later date which takes further advantage of these strict
|
||||
* dependency requirements.
|
||||
*
|
||||
* @throws MWException
|
||||
* @return PPNode_DOM
|
||||
*/
|
||||
public function preprocessToObj( $text, $flags = 0 ) {
|
||||
$xml = $this->cacheGetTree( $text, $flags );
|
||||
if ( $xml === false ) {
|
||||
$xml = $this->preprocessToXml( $text, $flags );
|
||||
$this->cacheSetTree( $text, $flags, $xml );
|
||||
}
|
||||
|
||||
// Fail if the number of elements exceeds acceptable limits
|
||||
// Do not attempt to generate the DOM
|
||||
$this->parser->mGeneratedPPNodeCount += substr_count( $xml, '<' );
|
||||
$max = $this->parser->mOptions->getMaxGeneratedPPNodeCount();
|
||||
if ( $this->parser->mGeneratedPPNodeCount > $max ) {
|
||||
// if ( $cacheable ) { ... }
|
||||
throw new MWException( __METHOD__ . ': generated node count limit exceeded' );
|
||||
}
|
||||
|
||||
$dom = new DOMDocument;
|
||||
Wikimedia\suppressWarnings();
|
||||
$result = $dom->loadXML( $xml );
|
||||
Wikimedia\restoreWarnings();
|
||||
if ( !$result ) {
|
||||
// Try running the XML through UtfNormal to get rid of invalid characters
|
||||
$xml = UtfNormal\Validator::cleanUp( $xml );
|
||||
// 1 << 19 == XML_PARSE_HUGE, needed so newer versions of libxml2
|
||||
// don't barf when the XML is >256 levels deep.
|
||||
$result = $dom->loadXML( $xml, 1 << 19 );
|
||||
}
|
||||
if ( $result ) {
|
||||
$obj = new PPNode_DOM( $dom->documentElement );
|
||||
}
|
||||
|
||||
// if ( $cacheable ) { ... }
|
||||
|
||||
if ( !$result ) {
|
||||
throw new MWException( __METHOD__ . ' generated invalid XML' );
|
||||
}
|
||||
return $obj;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $text
|
||||
* @param int $flags
|
||||
* @return string
|
||||
*/
|
||||
public function preprocessToXml( $text, $flags = 0 ) {
|
||||
global $wgDisableLangConversion;
|
||||
|
||||
$forInclusion = $flags & Parser::PTD_FOR_INCLUSION;
|
||||
|
||||
$xmlishElements = $this->parser->getStripList();
|
||||
$xmlishAllowMissingEndTag = [ 'includeonly', 'noinclude', 'onlyinclude' ];
|
||||
$enableOnlyinclude = false;
|
||||
if ( $forInclusion ) {
|
||||
$ignoredTags = [ 'includeonly', '/includeonly' ];
|
||||
$ignoredElements = [ 'noinclude' ];
|
||||
$xmlishElements[] = 'noinclude';
|
||||
if ( strpos( $text, '<onlyinclude>' ) !== false
|
||||
&& strpos( $text, '</onlyinclude>' ) !== false
|
||||
) {
|
||||
$enableOnlyinclude = true;
|
||||
}
|
||||
} else {
|
||||
$ignoredTags = [ 'noinclude', '/noinclude', 'onlyinclude', '/onlyinclude' ];
|
||||
$ignoredElements = [ 'includeonly' ];
|
||||
$xmlishElements[] = 'includeonly';
|
||||
}
|
||||
$xmlishRegex = implode( '|', array_merge( $xmlishElements, $ignoredTags ) );
|
||||
|
||||
// Use "A" modifier (anchored) instead of "^", because ^ doesn't work with an offset
|
||||
$elementsRegex = "~($xmlishRegex)(?:\s|\/>|>)|(!--)~iA";
|
||||
|
||||
$stack = new PPDStack;
|
||||
|
||||
$searchBase = "[{<\n"; # }
|
||||
if ( !$wgDisableLangConversion ) {
|
||||
$searchBase .= '-';
|
||||
}
|
||||
|
||||
// For fast reverse searches
|
||||
$revText = strrev( $text );
|
||||
$lengthText = strlen( $text );
|
||||
|
||||
// Input pointer, starts out pointing to a pseudo-newline before the start
|
||||
$i = 0;
|
||||
// Current accumulator
|
||||
$accum =& $stack->getAccum();
|
||||
$accum = '<root>';
|
||||
// True to find equals signs in arguments
|
||||
$findEquals = false;
|
||||
// True to take notice of pipe characters
|
||||
$findPipe = false;
|
||||
$headingIndex = 1;
|
||||
// True if $i is inside a possible heading
|
||||
$inHeading = false;
|
||||
// True if there are no more greater-than (>) signs right of $i
|
||||
$noMoreGT = false;
|
||||
// Map of tag name => true if there are no more closing tags of given type right of $i
|
||||
$noMoreClosingTag = [];
|
||||
// True to ignore all input up to the next <onlyinclude>
|
||||
$findOnlyinclude = $enableOnlyinclude;
|
||||
// Do a line-start run without outputting an LF character
|
||||
$fakeLineStart = true;
|
||||
|
||||
while ( true ) {
|
||||
// $this->memCheck();
|
||||
|
||||
if ( $findOnlyinclude ) {
|
||||
// Ignore all input up to the next <onlyinclude>
|
||||
$startPos = strpos( $text, '<onlyinclude>', $i );
|
||||
if ( $startPos === false ) {
|
||||
// Ignored section runs to the end
|
||||
$accum .= '<ignore>' . htmlspecialchars( substr( $text, $i ) ) . '</ignore>';
|
||||
break;
|
||||
}
|
||||
$tagEndPos = $startPos + strlen( '<onlyinclude>' ); // past-the-end
|
||||
$accum .= '<ignore>' . htmlspecialchars( substr( $text, $i, $tagEndPos - $i ) ) . '</ignore>';
|
||||
$i = $tagEndPos;
|
||||
$findOnlyinclude = false;
|
||||
}
|
||||
|
||||
if ( $fakeLineStart ) {
|
||||
$found = 'line-start';
|
||||
$curChar = '';
|
||||
} else {
|
||||
# Find next opening brace, closing brace or pipe
|
||||
$search = $searchBase;
|
||||
if ( $stack->top === false ) {
|
||||
$currentClosing = '';
|
||||
} else {
|
||||
$currentClosing = $stack->top->close;
|
||||
$search .= $currentClosing;
|
||||
}
|
||||
if ( $findPipe ) {
|
||||
$search .= '|';
|
||||
}
|
||||
if ( $findEquals ) {
|
||||
// First equals will be for the template
|
||||
$search .= '=';
|
||||
}
|
||||
$rule = null;
|
||||
# Output literal section, advance input counter
|
||||
$literalLength = strcspn( $text, $search, $i );
|
||||
if ( $literalLength > 0 ) {
|
||||
$accum .= htmlspecialchars( substr( $text, $i, $literalLength ) );
|
||||
$i += $literalLength;
|
||||
}
|
||||
if ( $i >= $lengthText ) {
|
||||
if ( $currentClosing == "\n" ) {
|
||||
// Do a past-the-end run to finish off the heading
|
||||
$curChar = '';
|
||||
$found = 'line-end';
|
||||
} else {
|
||||
# All done
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
$curChar = $curTwoChar = $text[$i];
|
||||
if ( ( $i + 1 ) < $lengthText ) {
|
||||
$curTwoChar .= $text[$i + 1];
|
||||
}
|
||||
if ( $curChar == '|' ) {
|
||||
$found = 'pipe';
|
||||
} elseif ( $curChar == '=' ) {
|
||||
$found = 'equals';
|
||||
} elseif ( $curChar == '<' ) {
|
||||
$found = 'angle';
|
||||
} elseif ( $curChar == "\n" ) {
|
||||
if ( $inHeading ) {
|
||||
$found = 'line-end';
|
||||
} else {
|
||||
$found = 'line-start';
|
||||
}
|
||||
} elseif ( $curTwoChar == $currentClosing ) {
|
||||
$found = 'close';
|
||||
$curChar = $curTwoChar;
|
||||
} elseif ( $curChar == $currentClosing ) {
|
||||
$found = 'close';
|
||||
} elseif ( isset( $this->rules[$curTwoChar] ) ) {
|
||||
$curChar = $curTwoChar;
|
||||
$found = 'open';
|
||||
$rule = $this->rules[$curChar];
|
||||
} elseif ( isset( $this->rules[$curChar] ) ) {
|
||||
$found = 'open';
|
||||
$rule = $this->rules[$curChar];
|
||||
} else {
|
||||
# Some versions of PHP have a strcspn which stops on
|
||||
# null characters; ignore these and continue.
|
||||
# We also may get '-' and '}' characters here which
|
||||
# don't match -{ or $currentClosing. Add these to
|
||||
# output and continue.
|
||||
if ( $curChar == '-' || $curChar == '}' ) {
|
||||
$accum .= $curChar;
|
||||
}
|
||||
++$i;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ( $found == 'angle' ) {
|
||||
$matches = false;
|
||||
// Handle </onlyinclude>
|
||||
if ( $enableOnlyinclude
|
||||
&& substr( $text, $i, strlen( '</onlyinclude>' ) ) == '</onlyinclude>'
|
||||
) {
|
||||
$findOnlyinclude = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
// Determine element name
|
||||
if ( !preg_match( $elementsRegex, $text, $matches, 0, $i + 1 ) ) {
|
||||
// Element name missing or not listed
|
||||
$accum .= '<';
|
||||
++$i;
|
||||
continue;
|
||||
}
|
||||
// Handle comments
|
||||
if ( isset( $matches[2] ) && $matches[2] == '!--' ) {
|
||||
// To avoid leaving blank lines, when a sequence of
|
||||
// space-separated comments is both preceded and followed by
|
||||
// a newline (ignoring spaces), then
|
||||
// trim leading and trailing spaces and the trailing newline.
|
||||
|
||||
// Find the end
|
||||
$endPos = strpos( $text, '-->', $i + 4 );
|
||||
if ( $endPos === false ) {
|
||||
// Unclosed comment in input, runs to end
|
||||
$inner = substr( $text, $i );
|
||||
$accum .= '<comment>' . htmlspecialchars( $inner ) . '</comment>';
|
||||
$i = $lengthText;
|
||||
} else {
|
||||
// Search backwards for leading whitespace
|
||||
$wsStart = $i ? ( $i - strspn( $revText, " \t", $lengthText - $i ) ) : 0;
|
||||
|
||||
// Search forwards for trailing whitespace
|
||||
// $wsEnd will be the position of the last space (or the '>' if there's none)
|
||||
$wsEnd = $endPos + 2 + strspn( $text, " \t", $endPos + 3 );
|
||||
|
||||
// Keep looking forward as long as we're finding more
|
||||
// comments.
|
||||
$comments = [ [ $wsStart, $wsEnd ] ];
|
||||
while ( substr( $text, $wsEnd + 1, 4 ) == '<!--' ) {
|
||||
$c = strpos( $text, '-->', $wsEnd + 4 );
|
||||
if ( $c === false ) {
|
||||
break;
|
||||
}
|
||||
$c = $c + 2 + strspn( $text, " \t", $c + 3 );
|
||||
$comments[] = [ $wsEnd + 1, $c ];
|
||||
$wsEnd = $c;
|
||||
}
|
||||
|
||||
// Eat the line if possible
|
||||
// TODO: This could theoretically be done if $wsStart == 0, i.e. for comments at
|
||||
// the overall start. That's not how Sanitizer::removeHTMLcomments() did it, but
|
||||
// it's a possible beneficial b/c break.
|
||||
if ( $wsStart > 0 && substr( $text, $wsStart - 1, 1 ) == "\n"
|
||||
&& substr( $text, $wsEnd + 1, 1 ) == "\n"
|
||||
) {
|
||||
// Remove leading whitespace from the end of the accumulator
|
||||
// Sanity check first though
|
||||
$wsLength = $i - $wsStart;
|
||||
if ( $wsLength > 0
|
||||
&& strspn( $accum, " \t", -$wsLength ) === $wsLength
|
||||
) {
|
||||
$accum = substr( $accum, 0, -$wsLength );
|
||||
}
|
||||
|
||||
// Dump all but the last comment to the accumulator
|
||||
foreach ( $comments as $j => $com ) {
|
||||
$startPos = $com[0];
|
||||
$endPos = $com[1] + 1;
|
||||
if ( $j == ( count( $comments ) - 1 ) ) {
|
||||
break;
|
||||
}
|
||||
$inner = substr( $text, $startPos, $endPos - $startPos );
|
||||
$accum .= '<comment>' . htmlspecialchars( $inner ) . '</comment>';
|
||||
}
|
||||
|
||||
// Do a line-start run next time to look for headings after the comment
|
||||
$fakeLineStart = true;
|
||||
} else {
|
||||
// No line to eat, just take the comment itself
|
||||
$startPos = $i;
|
||||
$endPos += 2;
|
||||
}
|
||||
|
||||
if ( $stack->top ) {
|
||||
$part = $stack->top->getCurrentPart();
|
||||
if ( !( isset( $part->commentEnd ) && $part->commentEnd == $wsStart - 1 ) ) {
|
||||
$part->visualEnd = $wsStart;
|
||||
}
|
||||
// Else comments abutting, no change in visual end
|
||||
$part->commentEnd = $endPos;
|
||||
}
|
||||
$i = $endPos + 1;
|
||||
$inner = substr( $text, $startPos, $endPos - $startPos + 1 );
|
||||
$accum .= '<comment>' . htmlspecialchars( $inner ) . '</comment>';
|
||||
}
|
||||
continue;
|
||||
}
|
||||
$name = $matches[1];
|
||||
$lowerName = strtolower( $name );
|
||||
$attrStart = $i + strlen( $name ) + 1;
|
||||
|
||||
// Find end of tag
|
||||
$tagEndPos = $noMoreGT ? false : strpos( $text, '>', $attrStart );
|
||||
if ( $tagEndPos === false ) {
|
||||
// Infinite backtrack
|
||||
// Disable tag search to prevent worst-case O(N^2) performance
|
||||
$noMoreGT = true;
|
||||
$accum .= '<';
|
||||
++$i;
|
||||
continue;
|
||||
}
|
||||
|
||||
// Handle ignored tags
|
||||
if ( in_array( $lowerName, $ignoredTags ) ) {
|
||||
$accum .= '<ignore>'
|
||||
. htmlspecialchars( substr( $text, $i, $tagEndPos - $i + 1 ) )
|
||||
. '</ignore>';
|
||||
$i = $tagEndPos + 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
$tagStartPos = $i;
|
||||
if ( $text[$tagEndPos - 1] == '/' ) {
|
||||
$attrEnd = $tagEndPos - 1;
|
||||
$inner = null;
|
||||
$i = $tagEndPos + 1;
|
||||
$close = '';
|
||||
} else {
|
||||
$attrEnd = $tagEndPos;
|
||||
// Find closing tag
|
||||
if (
|
||||
!isset( $noMoreClosingTag[$name] ) &&
|
||||
preg_match( "/<\/" . preg_quote( $name, '/' ) . "\s*>/i",
|
||||
$text, $matches, PREG_OFFSET_CAPTURE, $tagEndPos + 1 )
|
||||
) {
|
||||
$inner = substr( $text, $tagEndPos + 1, $matches[0][1] - $tagEndPos - 1 );
|
||||
$i = $matches[0][1] + strlen( $matches[0][0] );
|
||||
$close = '<close>' . htmlspecialchars( $matches[0][0] ) . '</close>';
|
||||
} else {
|
||||
// No end tag
|
||||
if ( in_array( $name, $xmlishAllowMissingEndTag ) ) {
|
||||
// Let it run out to the end of the text.
|
||||
$inner = substr( $text, $tagEndPos + 1 );
|
||||
$i = $lengthText;
|
||||
$close = '';
|
||||
} else {
|
||||
// Don't match the tag, treat opening tag as literal and resume parsing.
|
||||
$i = $tagEndPos + 1;
|
||||
$accum .= htmlspecialchars( substr( $text, $tagStartPos, $tagEndPos + 1 - $tagStartPos ) );
|
||||
// Cache results, otherwise we have O(N^2) performance for input like <foo><foo><foo>...
|
||||
$noMoreClosingTag[$name] = true;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
// <includeonly> and <noinclude> just become <ignore> tags
|
||||
if ( in_array( $lowerName, $ignoredElements ) ) {
|
||||
$accum .= '<ignore>' . htmlspecialchars( substr( $text, $tagStartPos, $i - $tagStartPos ) )
|
||||
. '</ignore>';
|
||||
continue;
|
||||
}
|
||||
|
||||
$accum .= '<ext>';
|
||||
if ( $attrEnd <= $attrStart ) {
|
||||
$attr = '';
|
||||
} else {
|
||||
$attr = substr( $text, $attrStart, $attrEnd - $attrStart );
|
||||
}
|
||||
$accum .= '<name>' . htmlspecialchars( $name ) . '</name>' .
|
||||
// Note that the attr element contains the whitespace between name and attribute,
|
||||
// this is necessary for precise reconstruction during pre-save transform.
|
||||
'<attr>' . htmlspecialchars( $attr ) . '</attr>';
|
||||
if ( $inner !== null ) {
|
||||
$accum .= '<inner>' . htmlspecialchars( $inner ) . '</inner>';
|
||||
}
|
||||
$accum .= $close . '</ext>';
|
||||
} elseif ( $found == 'line-start' ) {
|
||||
// Is this the start of a heading?
|
||||
// Line break belongs before the heading element in any case
|
||||
if ( $fakeLineStart ) {
|
||||
$fakeLineStart = false;
|
||||
} else {
|
||||
$accum .= $curChar;
|
||||
$i++;
|
||||
}
|
||||
|
||||
$count = strspn( $text, '=', $i, 6 );
|
||||
if ( $count == 1 && $findEquals ) {
|
||||
// DWIM: This looks kind of like a name/value separator.
|
||||
// Let's let the equals handler have it and break the
|
||||
// potential heading. This is heuristic, but AFAICT the
|
||||
// methods for completely correct disambiguation are very
|
||||
// complex.
|
||||
} elseif ( $count > 0 ) {
|
||||
$piece = [
|
||||
'open' => "\n",
|
||||
'close' => "\n",
|
||||
'parts' => [ new PPDPart( str_repeat( '=', $count ) ) ],
|
||||
'startPos' => $i,
|
||||
'count' => $count ];
|
||||
$stack->push( $piece );
|
||||
$accum =& $stack->getAccum();
|
||||
$stackFlags = $stack->getFlags();
|
||||
if ( isset( $stackFlags['findEquals'] ) ) {
|
||||
$findEquals = $stackFlags['findEquals'];
|
||||
}
|
||||
if ( isset( $stackFlags['findPipe'] ) ) {
|
||||
$findPipe = $stackFlags['findPipe'];
|
||||
}
|
||||
if ( isset( $stackFlags['inHeading'] ) ) {
|
||||
$inHeading = $stackFlags['inHeading'];
|
||||
}
|
||||
$i += $count;
|
||||
}
|
||||
} elseif ( $found == 'line-end' ) {
|
||||
$piece = $stack->top;
|
||||
// A heading must be open, otherwise \n wouldn't have been in the search list
|
||||
// FIXME: Don't use assert()
|
||||
// phpcs:ignore MediaWiki.Usage.ForbiddenFunctions.assert
|
||||
assert( $piece->open === "\n" );
|
||||
$part = $piece->getCurrentPart();
|
||||
// Search back through the input to see if it has a proper close.
|
||||
// Do this using the reversed string since the other solutions
|
||||
// (end anchor, etc.) are inefficient.
|
||||
$wsLength = strspn( $revText, " \t", $lengthText - $i );
|
||||
$searchStart = $i - $wsLength;
|
||||
if ( isset( $part->commentEnd ) && $searchStart - 1 == $part->commentEnd ) {
|
||||
// Comment found at line end
|
||||
// Search for equals signs before the comment
|
||||
$searchStart = $part->visualEnd;
|
||||
$searchStart -= strspn( $revText, " \t", $lengthText - $searchStart );
|
||||
}
|
||||
$count = $piece->count;
|
||||
$equalsLength = strspn( $revText, '=', $lengthText - $searchStart );
|
||||
if ( $equalsLength > 0 ) {
|
||||
if ( $searchStart - $equalsLength == $piece->startPos ) {
|
||||
// This is just a single string of equals signs on its own line
|
||||
// Replicate the doHeadings behavior /={count}(.+)={count}/
|
||||
// First find out how many equals signs there really are (don't stop at 6)
|
||||
$count = $equalsLength;
|
||||
if ( $count < 3 ) {
|
||||
$count = 0;
|
||||
} else {
|
||||
$count = min( 6, intval( ( $count - 1 ) / 2 ) );
|
||||
}
|
||||
} else {
|
||||
$count = min( $equalsLength, $count );
|
||||
}
|
||||
if ( $count > 0 ) {
|
||||
// Normal match, output <h>
|
||||
$element = "<h level=\"$count\" i=\"$headingIndex\">$accum</h>";
|
||||
$headingIndex++;
|
||||
} else {
|
||||
// Single equals sign on its own line, count=0
|
||||
$element = $accum;
|
||||
}
|
||||
} else {
|
||||
// No match, no <h>, just pass down the inner text
|
||||
$element = $accum;
|
||||
}
|
||||
// Unwind the stack
|
||||
$stack->pop();
|
||||
$accum =& $stack->getAccum();
|
||||
$stackFlags = $stack->getFlags();
|
||||
if ( isset( $stackFlags['findEquals'] ) ) {
|
||||
$findEquals = $stackFlags['findEquals'];
|
||||
}
|
||||
if ( isset( $stackFlags['findPipe'] ) ) {
|
||||
$findPipe = $stackFlags['findPipe'];
|
||||
}
|
||||
if ( isset( $stackFlags['inHeading'] ) ) {
|
||||
$inHeading = $stackFlags['inHeading'];
|
||||
}
|
||||
|
||||
// Append the result to the enclosing accumulator
|
||||
$accum .= $element;
|
||||
// Note that we do NOT increment the input pointer.
|
||||
// This is because the closing linebreak could be the opening linebreak of
|
||||
// another heading. Infinite loops are avoided because the next iteration MUST
|
||||
// hit the heading open case above, which unconditionally increments the
|
||||
// input pointer.
|
||||
} elseif ( $found == 'open' ) {
|
||||
# count opening brace characters
|
||||
$curLen = strlen( $curChar );
|
||||
$count = ( $curLen > 1 ) ?
|
||||
# allow the final character to repeat
|
||||
strspn( $text, $curChar[$curLen - 1], $i + 1 ) + 1 :
|
||||
strspn( $text, $curChar, $i );
|
||||
|
||||
$savedPrefix = '';
|
||||
$lineStart = ( $i > 0 && $text[$i - 1] == "\n" );
|
||||
|
||||
if ( $curChar === "-{" && $count > $curLen ) {
|
||||
// -{ => {{ transition because rightmost wins
|
||||
$savedPrefix = '-';
|
||||
$i++;
|
||||
$curChar = '{';
|
||||
$count--;
|
||||
$rule = $this->rules[$curChar];
|
||||
}
|
||||
|
||||
# we need to add to stack only if opening brace count is enough for one of the rules
|
||||
if ( $count >= $rule['min'] ) {
|
||||
# Add it to the stack
|
||||
$piece = [
|
||||
'open' => $curChar,
|
||||
'close' => $rule['end'],
|
||||
'savedPrefix' => $savedPrefix,
|
||||
'count' => $count,
|
||||
'lineStart' => $lineStart,
|
||||
];
|
||||
|
||||
$stack->push( $piece );
|
||||
$accum =& $stack->getAccum();
|
||||
$stackFlags = $stack->getFlags();
|
||||
if ( isset( $stackFlags['findEquals'] ) ) {
|
||||
$findEquals = $stackFlags['findEquals'];
|
||||
}
|
||||
if ( isset( $stackFlags['findPipe'] ) ) {
|
||||
$findPipe = $stackFlags['findPipe'];
|
||||
}
|
||||
if ( isset( $stackFlags['inHeading'] ) ) {
|
||||
$inHeading = $stackFlags['inHeading'];
|
||||
}
|
||||
} else {
|
||||
# Add literal brace(s)
|
||||
$accum .= htmlspecialchars( $savedPrefix . str_repeat( $curChar, $count ) );
|
||||
}
|
||||
$i += $count;
|
||||
} elseif ( $found == 'close' ) {
|
||||
$piece = $stack->top;
|
||||
# lets check if there are enough characters for closing brace
|
||||
$maxCount = $piece->count;
|
||||
if ( $piece->close === '}-' && $curChar === '}' ) {
|
||||
$maxCount--; # don't try to match closing '-' as a '}'
|
||||
}
|
||||
$curLen = strlen( $curChar );
|
||||
$count = ( $curLen > 1 ) ? $curLen :
|
||||
strspn( $text, $curChar, $i, $maxCount );
|
||||
|
||||
# check for maximum matching characters (if there are 5 closing
|
||||
# characters, we will probably need only 3 - depending on the rules)
|
||||
$rule = $this->rules[$piece->open];
|
||||
if ( $count > $rule['max'] ) {
|
||||
# The specified maximum exists in the callback array, unless the caller
|
||||
# has made an error
|
||||
$matchingCount = $rule['max'];
|
||||
} else {
|
||||
# Count is less than the maximum
|
||||
# Skip any gaps in the callback array to find the true largest match
|
||||
# Need to use array_key_exists not isset because the callback can be null
|
||||
$matchingCount = $count;
|
||||
while ( $matchingCount > 0 && !array_key_exists( $matchingCount, $rule['names'] ) ) {
|
||||
--$matchingCount;
|
||||
}
|
||||
}
|
||||
|
||||
if ( $matchingCount <= 0 ) {
|
||||
# No matching element found in callback array
|
||||
# Output a literal closing brace and continue
|
||||
$endText = substr( $text, $i, $count );
|
||||
$accum .= htmlspecialchars( $endText );
|
||||
$i += $count;
|
||||
continue;
|
||||
}
|
||||
$name = $rule['names'][$matchingCount];
|
||||
if ( $name === null ) {
|
||||
// No element, just literal text
|
||||
$endText = substr( $text, $i, $matchingCount );
|
||||
$element = $piece->breakSyntax( $matchingCount ) . $endText;
|
||||
} else {
|
||||
# Create XML element
|
||||
# Note: $parts is already XML, does not need to be encoded further
|
||||
$parts = $piece->parts;
|
||||
$title = $parts[0]->out;
|
||||
unset( $parts[0] );
|
||||
|
||||
# The invocation is at the start of the line if lineStart is set in
|
||||
# the stack, and all opening brackets are used up.
|
||||
if ( $maxCount == $matchingCount &&
|
||||
!empty( $piece->lineStart ) &&
|
||||
strlen( $piece->savedPrefix ) == 0 ) {
|
||||
$attr = ' lineStart="1"';
|
||||
} else {
|
||||
$attr = '';
|
||||
}
|
||||
|
||||
$element = "<$name$attr>";
|
||||
$element .= "<title>$title</title>";
|
||||
$argIndex = 1;
|
||||
foreach ( $parts as $part ) {
|
||||
if ( isset( $part->eqpos ) ) {
|
||||
$argName = substr( $part->out, 0, $part->eqpos );
|
||||
$argValue = substr( $part->out, $part->eqpos + 1 );
|
||||
$element .= "<part><name>$argName</name>=<value>$argValue</value></part>";
|
||||
} else {
|
||||
$element .= "<part><name index=\"$argIndex\" /><value>{$part->out}</value></part>";
|
||||
$argIndex++;
|
||||
}
|
||||
}
|
||||
$element .= "</$name>";
|
||||
}
|
||||
|
||||
# Advance input pointer
|
||||
$i += $matchingCount;
|
||||
|
||||
# Unwind the stack
|
||||
$stack->pop();
|
||||
$accum =& $stack->getAccum();
|
||||
|
||||
# Re-add the old stack element if it still has unmatched opening characters remaining
|
||||
if ( $matchingCount < $piece->count ) {
|
||||
$piece->parts = [ new PPDPart ];
|
||||
$piece->count -= $matchingCount;
|
||||
# do we still qualify for any callback with remaining count?
|
||||
$min = $this->rules[$piece->open]['min'];
|
||||
if ( $piece->count >= $min ) {
|
||||
$stack->push( $piece );
|
||||
$accum =& $stack->getAccum();
|
||||
} elseif ( $piece->count == 1 && $piece->open === '{' && $piece->savedPrefix === '-' ) {
|
||||
$piece->savedPrefix = '';
|
||||
$piece->open = '-{';
|
||||
$piece->count = 2;
|
||||
$piece->close = $this->rules[$piece->open]['end'];
|
||||
$stack->push( $piece );
|
||||
$accum =& $stack->getAccum();
|
||||
} else {
|
||||
$s = substr( $piece->open, 0, -1 );
|
||||
$s .= str_repeat(
|
||||
substr( $piece->open, -1 ),
|
||||
$piece->count - strlen( $s )
|
||||
);
|
||||
$accum .= $piece->savedPrefix . $s;
|
||||
}
|
||||
} elseif ( $piece->savedPrefix !== '' ) {
|
||||
$accum .= $piece->savedPrefix;
|
||||
}
|
||||
|
||||
$stackFlags = $stack->getFlags();
|
||||
if ( isset( $stackFlags['findEquals'] ) ) {
|
||||
$findEquals = $stackFlags['findEquals'];
|
||||
}
|
||||
if ( isset( $stackFlags['findPipe'] ) ) {
|
||||
$findPipe = $stackFlags['findPipe'];
|
||||
}
|
||||
if ( isset( $stackFlags['inHeading'] ) ) {
|
||||
$inHeading = $stackFlags['inHeading'];
|
||||
}
|
||||
|
||||
# Add XML element to the enclosing accumulator
|
||||
$accum .= $element;
|
||||
} elseif ( $found == 'pipe' ) {
|
||||
$findEquals = true; // shortcut for getFlags()
|
||||
$stack->addPart();
|
||||
$accum =& $stack->getAccum();
|
||||
++$i;
|
||||
} elseif ( $found == 'equals' ) {
|
||||
$findEquals = false; // shortcut for getFlags()
|
||||
$stack->getCurrentPart()->eqpos = strlen( $accum );
|
||||
$accum .= '=';
|
||||
++$i;
|
||||
}
|
||||
}
|
||||
|
||||
# Output any remaining unclosed brackets
|
||||
foreach ( $stack->stack as $piece ) {
|
||||
$stack->rootAccum .= $piece->breakSyntax();
|
||||
}
|
||||
$stack->rootAccum .= '</root>';
|
||||
$xml = $stack->rootAccum;
|
||||
|
||||
return $xml;
|
||||
}
|
||||
}
|
||||
|
|
@ -72,7 +72,7 @@ class PreprocessDump extends DumpIterator {
|
|||
} elseif ( isset( $wgParserConf['preprocessorClass'] ) ) {
|
||||
$name = $wgParserConf['preprocessorClass'];
|
||||
} else {
|
||||
$name = Preprocessor_DOM::class;
|
||||
$name = Preprocessor_Hash::class;
|
||||
}
|
||||
|
||||
$parser = MediaWikiServices::getInstance()->getParser();
|
||||
|
|
|
|||
|
|
@ -802,10 +802,6 @@ class ParserTestRunner {
|
|||
$class = $wgParserConf['class'];
|
||||
$parser = new $class( [ 'preprocessorClass' => $preprocessor ] + $wgParserConf );
|
||||
if ( $preprocessor ) {
|
||||
# Suppress deprecation warning for Preprocessor_DOM while testing
|
||||
Wikimedia\suppressWarnings();
|
||||
wfDeprecated( 'Preprocessor_DOM::__construct' );
|
||||
Wikimedia\restoreWarnings();
|
||||
$parser->getPreprocessor();
|
||||
}
|
||||
ParserTestParserHook::setup( $parser );
|
||||
|
|
@ -833,6 +829,9 @@ class ParserTestRunner {
|
|||
public function runTest( $test ) {
|
||||
wfDebug( __METHOD__ . ": running {$test['desc']}" );
|
||||
$opts = $this->parseOptions( $test['options'] );
|
||||
if ( isset( $opts['preprocessor'] ) && $opts['preprocessor'] !== 'Preprocessor_Hash' ) {
|
||||
return false; // Skip test.
|
||||
}
|
||||
$teardownGuard = $this->perTestSetup( $test );
|
||||
|
||||
$context = RequestContext::getMain();
|
||||
|
|
@ -891,8 +890,7 @@ class ParserTestRunner {
|
|||
}
|
||||
|
||||
$local = isset( $opts['local'] );
|
||||
$preprocessor = $opts['preprocessor'] ?? null;
|
||||
$parser = $this->getParser( $preprocessor );
|
||||
$parser = $this->getParser();
|
||||
|
||||
if ( isset( $opts['styletag'] ) ) {
|
||||
// For testing the behavior of <style> (including those deduplicated
|
||||
|
|
|
|||
|
|
@ -827,13 +827,11 @@ class ApiParseTest extends ApiTestCase {
|
|||
'prop' => 'parsetree',
|
||||
] );
|
||||
|
||||
// Preprocessor_DOM and Preprocessor_Hash give different results here,
|
||||
// so we'll accept either
|
||||
$this->assertRegExp(
|
||||
'#^<root>Some \'\'text\'\' is <template><title>nice</title>' .
|
||||
$this->assertEquals(
|
||||
'<root>Some \'\'text\'\' is <template><title>nice</title>' .
|
||||
'<part><name index="1"/><value>to have</value></part>' .
|
||||
'<part><name>i</name>(?:<equals>)?=(?:</equals>)?<value>think</value></part>' .
|
||||
'</template></root>$#',
|
||||
'<part><name>i</name><equals>=</equals><value>think</value></part>' .
|
||||
'</template></root>',
|
||||
$res[0]['parse']['parsetree']
|
||||
);
|
||||
$this->assertArrayNotHasKey( 'warnings', $res[0] );
|
||||
|
|
|
|||
|
|
@ -9,15 +9,6 @@ use MediaWiki\MediaWikiServices;
|
|||
* @covers Parser
|
||||
* @covers StripState
|
||||
*
|
||||
* @covers Preprocessor_DOM
|
||||
* @covers PPDStack
|
||||
* @covers PPDStackElement
|
||||
* @covers PPDPart
|
||||
* @covers PPFrame_DOM
|
||||
* @covers PPTemplateFrame_DOM
|
||||
* @covers PPCustomFrame_DOM
|
||||
* @covers PPNode_DOM
|
||||
*
|
||||
* @covers Preprocessor_Hash
|
||||
* @covers PPDStack_Hash
|
||||
* @covers PPDStackElement_Hash
|
||||
|
|
|
|||
|
|
@ -5,15 +5,6 @@ use MediaWiki\MediaWikiServices;
|
|||
/**
|
||||
* @covers Preprocessor
|
||||
*
|
||||
* @covers Preprocessor_DOM
|
||||
* @covers PPDStack
|
||||
* @covers PPDStackElement
|
||||
* @covers PPDPart
|
||||
* @covers PPFrame_DOM
|
||||
* @covers PPTemplateFrame_DOM
|
||||
* @covers PPCustomFrame_DOM
|
||||
* @covers PPNode_DOM
|
||||
*
|
||||
* @covers Preprocessor_Hash
|
||||
* @covers PPDStack_Hash
|
||||
* @covers PPDStackElement_Hash
|
||||
|
|
@ -39,7 +30,6 @@ class PreprocessorTest extends MediaWikiTestCase {
|
|||
protected $mPreprocessors;
|
||||
|
||||
protected static $classNames = [
|
||||
Preprocessor_DOM::class,
|
||||
Preprocessor_Hash::class
|
||||
];
|
||||
|
||||
|
|
@ -48,9 +38,6 @@ class PreprocessorTest extends MediaWikiTestCase {
|
|||
$this->mOptions = ParserOptions::newFromUserAndLang( new User,
|
||||
MediaWikiServices::getInstance()->getContentLanguage() );
|
||||
|
||||
# Suppress deprecation warning for Preprocessor_DOM while testing
|
||||
$this->hideDeprecated( 'Preprocessor_DOM::__construct' );
|
||||
|
||||
$this->mPreprocessors = [];
|
||||
foreach ( self::$classNames as $className ) {
|
||||
$this->mPreprocessors[$className] = new $className( $this );
|
||||
|
|
|
|||
|
|
@ -10,15 +10,6 @@ use MediaWiki\MediaWikiServices;
|
|||
* @covers BlockLevelPass
|
||||
* @covers StripState
|
||||
*
|
||||
* @covers Preprocessor_DOM
|
||||
* @covers PPDStack
|
||||
* @covers PPDStackElement
|
||||
* @covers PPDPart
|
||||
* @covers PPFrame_DOM
|
||||
* @covers PPTemplateFrame_DOM
|
||||
* @covers PPCustomFrame_DOM
|
||||
* @covers PPNode_DOM
|
||||
*
|
||||
* @covers Preprocessor_Hash
|
||||
* @covers PPDStack_Hash
|
||||
* @covers PPDStackElement_Hash
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ use Wikimedia\ScopedCallback;
|
|||
* @covers CoreTagHooks
|
||||
* @covers Sanitizer
|
||||
* @covers Preprocessor
|
||||
* @covers Preprocessor_DOM
|
||||
* @covers Preprocessor_Hash
|
||||
* @covers DateFormatter
|
||||
* @covers LinkHolderArray
|
||||
|
|
@ -51,6 +50,10 @@ class ParserIntegrationTest extends PHPUnit\Framework\TestCase {
|
|||
public function testParse() {
|
||||
$this->ptRunner->getRecorder()->setTestCase( $this );
|
||||
$result = $this->ptRunner->runTest( $this->ptTest );
|
||||
if ( $result === false ) {
|
||||
// Test intentionally skipped.
|
||||
$result = new ParserTestResult( $this->ptTest, "SKIP", "SKIP" );
|
||||
}
|
||||
$this->assertEquals( $result->expected, $result->actual );
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue