tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUG Tweak shortcode parser so it properly parse empty attributes

Browse Source
This commit is contained in:
Maxime Rainville 2021-02-25 15:18:16 +13:00
parent 651e5e205a
commit 028c4fdaa1
2 changed files with 62 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/View/Parsers/ShortcodeParser.php
View File

@ -263,8 +263,8 @@ class ShortcodeParser
([^\s\/\'"=,]+) # Name ([^\s\/\'"=,]+) # Name
\s* = \s* \s* = \s*
(?: (?:
(?:\'([^\']+)\') | # Value surrounded by \' (?:\'([^\']*)\') | # Value surrounded by \'
(?:"([^"]+)") | # Value surrounded by " (?:"([^"]*)") | # Value surrounded by "
([^\s,\]]+) # Bare value ([^\s,\]]+) # Bare value
) )
'; ';

83
tests/php/View/Parsers/ShortcodeParserTest.php
View File

@ -79,37 +79,54 @@ class ShortcodeParserTest extends SapphireTest
); );
} }
public function testSimpleTag() public function simpleTagDataProvider()
{ {
$tests = [ return [
'[test_shortcode]', ['[test_shortcode]'],
'[test_shortcode ]', '[test_shortcode,]', '[test_shortcode, ]' . '[test_shortcode/]', '[test_shortcode /]', '[test_shortcode,/]', '[test_shortcode, /]' ['[test_shortcode ]'],
['[test_shortcode,]'],
['[test_shortcode, ][test_shortcode/]'],
['[test_shortcode /]'],
['[test_shortcode,/]'],
['[test_shortcode, /]']
]; ];
foreach ($tests as $test) {
$this->parser->parse($test);
$this->assertEquals([], $this->arguments, $test);
$this->assertEquals('', $this->contents, $test);
$this->assertEquals('test_shortcode', $this->tagName, $test);
}
} }
public function testOneArgument() /**
* @dataProvider simpleTagDataProvider
*/
public function testSimpleTag($test)
{ {
$tests = [ $this->parser->parse($test);
'[test_shortcode foo="bar"]', '[test_shortcode,foo="bar"]', $this->assertEquals([], $this->arguments, $test);
"[test_shortcode foo='bar']", "[test_shortcode,foo='bar']", $this->assertEquals('', $this->contents, $test);
'[test_shortcode foo = "bar" /]', '[test_shortcode, foo = "bar" /]' $this->assertEquals('test_shortcode', $this->tagName, $test);
}
public function oneArgumentDataProvider()
{
return [
['[test_shortcode foo="bar"]'],
['[test_shortcode,foo="bar"]'],
["[test_shortcode foo='bar']"],
["[test_shortcode,foo='bar']"],
["[test_shortcode foo=bar]"],
["[test_shortcode,foo=bar]"],
['[test_shortcode foo = "bar" /]'],
['[test_shortcode, foo = "bar" /]']
]; ];
}
foreach ($tests as $test) { /**
$this->parser->parse($test); * @dataProvider oneArgumentDataProvider
*/
public function testOneArgument($test)
{
$this->parser->parse($test);
$this->assertEquals(['foo' => 'bar'], $this->arguments, $test); $this->assertEquals(['foo' => 'bar'], $this->arguments, $test);
$this->assertEquals('', $this->contents, $test); $this->assertEquals('', $this->contents, $test);
$this->assertEquals('test_shortcode', $this->tagName, $test); $this->assertEquals('test_shortcode', $this->tagName, $test);
}
} }
public function testMultipleArguments() public function testMultipleArguments()
@ -121,6 +138,26 @@ class ShortcodeParserTest extends SapphireTest
$this->assertEquals('test_shortcode', $this->tagName); $this->assertEquals('test_shortcode', $this->tagName);
} }
public function emptyArgumentsDataProvider()
{
return [
['[test_shortcode foo=""]'],
['[test_shortcode,foo=\'\']'],
['[test_shortcode foo=""][/test_shortcode]'],
];
}
/**
* @dataProvider emptyArgumentsDataProvider
*/
public function testEmptyArguments($test)
{
$this->parser->parse($test);
$this->assertEquals(['foo' => ''], $this->arguments);
$this->assertEquals('', $this->contents);
$this->assertEquals('test_shortcode', $this->tagName);
}
public function testEnclosing() public function testEnclosing()
{ {
$this->parser->parse('[test_shortcode]foo[/test_shortcode]'); $this->parser->parse('[test_shortcode]foo[/test_shortcode]');