diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bad merge

Browse Source
This commit is contained in:
Nicolas Grekas 2017-04-11 22:42:49 +02:00
parent a2bd375f60
commit e71807bc60
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Symfony/Component/Yaml/Tests/InlineTest.php
View File

@ -277,29 +277,14 @@ class InlineTest extends TestCase
* @expectedException \Symfony\Component\Yaml\Exception\ParseException
* @expectedExceptionMessage cannot start a plain scalar; you need to quote the scalar.
*/
public function testParseUnquotedScalarStartingWithReservedAtIndicator()
public function testParseUnquotedScalarStartingWithReservedIndicator($indicator)
{
Inline::parse('{ foo: @foo }');
Inline::parse(sprintf('{ foo: %sfoo }', $indicator));
}
/**
* @group legacy
* @expectedDeprecation Not quoting the scalar "`foo " starting with "`" is deprecated since Symfony 2.8 and will throw a ParseException in 3.0.
* throws \Symfony\Component\Yaml\Exception\ParseException in 3.0
*/
public function testParseUnquotedScalarStartingWithReservedBacktickIndicator()
public function getReservedIndicators()
{
Inline::parse('{ foo: `foo }');
}
/**
* @group legacy
* @expectedDeprecation Not quoting the scalar "|foo " starting with "|" is deprecated since Symfony 2.8 and will throw a ParseException in 3.0.
* throws \Symfony\Component\Yaml\Exception\ParseException in 3.0
*/
public function testParseUnquotedScalarStartingWithLiteralStyleIndicator()
{
Inline::parse('{ foo: |foo }');
return array(array('@'), array('`'));
}
/**
@ -307,9 +292,9 @@ class InlineTest extends TestCase
* @expectedException \Symfony\Component\Yaml\Exception\ParseException
* @expectedExceptionMessage cannot start a plain scalar; you need to quote the scalar.
*/
public function testParseUnquotedScalarStartingWithFoldedStyleIndicator()
public function testParseUnquotedScalarStartingWithScalarIndicator($indicator)
{
Inline::parse('{ foo: >foo }');
Inline::parse(sprintf('{ foo: %sfoo }', $indicator));
}
public function getScalarIndicators()