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

fabpot · fabpot · commit 558ddaa0763a · 2015-10-12T12:26:26.000+02:00
diff --git a/src/Symfony/Component/Yaml/CHANGELOG.md b/src/Symfony/Component/Yaml/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+3.0.0
+-----
+
+ * Yaml::parse() now throws an exception when a blackslash is not escaped
+   in double-quoted strings
+
 2.8.0
 -----
 
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -71,12 +71,11 @@ public function testHashStringsResemblingExponentialNumericsShouldNotBeChangedTo
     }
 
     /**
-     * @group legacy
-     * throws \Symfony\Component\Yaml\Exception\ParseException in 3.0
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
      */
     public function testParseScalarWithNonEscapedBlackslashShouldThrowException()
     {
-        $this->assertSame('Foo\Var', Inline::parse('"Foo\Var"'));
+        Inline::parse('"Foo\Var"');
     }
 
     /**
diff --git a/src/Symfony/Component/Yaml/Unescaper.php b/src/Symfony/Component/Yaml/Unescaper.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Yaml;
 
+use Symfony\Component\Yaml\Exception\ParseException;
+
 /**
  * Unescaper encapsulates unescaping rules for single and double-quoted
  * YAML strings.
@@ -63,7 +65,7 @@ public function unescapeDoubleQuotedString($value)
      * @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]) {
             case '0':
@@ -113,9 +115,7 @@ public function unescapeCharacter($value)
             case 'U':
                 return self::utf8chr(hexdec(substr($value, 2, 8)));
             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);
-
-                return $value;
+                throw new ParseException(sprintf('Found unknown escape character (%s in \\%s).', $value, $value));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -71,12 +71,11 @@ public function testHashStringsResemblingExponentialNumericsShouldNotBeChangedTo`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`/**`
`74`		`- * @group legacy`
`75`		`- * throws \Symfony\Component\Yaml\Exception\ParseException in 3.0`
	`74`	`+ * @expectedException \Symfony\Component\Yaml\Exception\ParseException`
`76`	`75`	`*/`
`77`	`76`	`public function testParseScalarWithNonEscapedBlackslashShouldThrowException()`
`78`	`77`	`{`
`79`		`- $this->assertSame('Foo\Var', Inline::parse('"Foo\Var"'));`
	`78`	`+ Inline::parse('"Foo\Var"');`
`80`	`79`	`}`
`81`	`80`
`82`	`81`	`/**`