wikimedia/mediawiki-extensions-TemplateData
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/TemplateData synced 2024-11-15 03:34:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore bang magic word in table syntax when guessing parameters

Browse source 
Three-braces-and-a-bang can be a table starting construct in templates.

This also fixes an overlooked bug in which the test wasn't checking
array element key names.

Bug: T157029
Change-Id: I69ed4fc9fe3bb126b7b39abea0f58ad56adf3885
This commit is contained in:
Sam Wilson 2018-10-23 12:59:11 +08:00
parent af1bb1bffd
commit 75e54ae999
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/TemplateDataBlob.php
View file

@ -904,7 +904,7 @@ class TemplateDataBlob {
*/
public static function getRawParams( $wikitext ) {
// This regex matches the one in ext.TemplateDataGenerator.sourceHandler.js
preg_match_all( '/{{3,}([^#]*?)[<|}]/m', $wikitext, $rawParams );
preg_match_all( '/{{3,}([^#]*?)([<|]|}{3,})/m', $wikitext, $rawParams );
$params = [];
$normalizedParams = [];
if ( isset( $rawParams[1] ) ) {

2
modules/ext.templateDataGenerator.sourceHandler.js
View file

@ -167,7 +167,7 @@ mw.TemplateData.SourceHandler.prototype.extractParametersFromTemplateCode = func
paramNames = [],
normalizedParamNames = [],
// This regex matches the one in TemplateDataBlob.php
paramExtractor = /{{3,}([^#]*?)[<|}]/mg;
paramExtractor = /{{3,}([^#]*?)([<|]|}{3,})/mg;
while ( ( matches = paramExtractor.exec( templateCode ) ) !== null ) {
// This normalization process is repeated in PHP in TemplateDataBlob.php

13
tests/phpunit/TemplateDataBlobTest.php
View file

@ -1214,7 +1214,8 @@ class TemplateDataBlobTest extends MediaWikiTestCase {
* @dataProvider provideGetRawParams
*/
public function testGetRawParams( $inputWikitext, $expectedParams ) {
$this->assertArrayEquals( $expectedParams, TemplateDataBlob::getRawParams( $inputWikitext ) );
$params = TemplateDataBlob::getRawParams( $inputWikitext );
$this->assertArrayEquals( $expectedParams, $params, true, true );
}
public function provideGetRawParams() {
@ -1246,7 +1247,15 @@ class TemplateDataBlobTest extends MediaWikiTestCase {
'More complicated dynamic param name' => [
'{{{party{{#if:{{{party_election||}}}|_election||}}|}}}',
[ 'party_election' => [] ]
]
],
'Bang in a param name' => [
'{{{!}}} {{{foo!}}}',
[ '!' => [], 'foo!' => [] ]
],
'Bang as a magic word in a table construct' => [
'{{{!}} class=""',
[]
],
];
}
}