[Yaml] removed parsing of non-escaped backslash in a double-quoted string

This commit is contained in:
Fabien Potencier 2015-10-11 14:23:49 +02:00
parent 133bd0a274
commit 5dbf6bc9b5
3 changed files with 13 additions and 10 deletions

View File

@ -1,6 +1,12 @@
CHANGELOG CHANGELOG
========= =========
3.0.0
-----
* Yaml::parse() now throws an exception when a blackslash is not escaped
in double-quoted strings
2.8.0 2.8.0
----- -----

View File

@ -71,12 +71,12 @@ class InlineTest extends \PHPUnit_Framework_TestCase
} }
/** /**
* @group legacy * @expectedException \Symfony\Component\Yaml\Exception\ParseException
* throws \Symfony\Component\Yaml\Exception\ParseException in 3.0 * @expectedExceptionMessage Found unknown escape character "\V".
*/ */
public function testParseScalarWithNonEscapedBlackslashShouldThrowException() public function testParseScalarWithNonEscapedBlackslashShouldThrowException()
{ {
$this->assertSame('Foo\Var', Inline::parse('"Foo\Var"')); Inline::parse('"Foo\Var"');
} }
/** /**

View File

@ -11,6 +11,8 @@
namespace Symfony\Component\Yaml; namespace Symfony\Component\Yaml;
use Symfony\Component\Yaml\Exception\ParseException;
/** /**
* Unescaper encapsulates unescaping rules for single and double-quoted * Unescaper encapsulates unescaping rules for single and double-quoted
* YAML strings. * YAML strings.
@ -59,11 +61,8 @@ class Unescaper
* @param string $value An escaped character * @param string $value An escaped character
* *
* @return string The unescaped character * @return string The unescaped character
*
* @internal This method is public to be usable as callback. It should not
* be used in user code. Should be changed in 3.0.
*/ */
public function unescapeCharacter($value) private function unescapeCharacter($value)
{ {
switch ($value[1]) { switch ($value[1]) {
case '0': case '0':
@ -113,9 +112,7 @@ class Unescaper
case 'U': case 'U':
return self::utf8chr(hexdec(substr($value, 2, 8))); return self::utf8chr(hexdec(substr($value, 2, 8)));
default: default:
@trigger_error('Not escaping a backslash in a double-quoted string is deprecated since Symfony 2.8 and will throw a ParseException in 3.0.', E_USER_DEPRECATED); throw new ParseException(sprintf('Found unknown escape character "%s".', $value));
return $value;
} }
} }