[Yaml] deprecated usage of @ and ` at the beginning of an unquoted string

fabpot · fabpot · commit 7fee29fe6d9a · 2015-10-27T21:32:32.000-07:00
diff --git a/src/Symfony/Component/Yaml/CHANGELOG.md b/src/Symfony/Component/Yaml/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 2.8.0
 -----
 
+ * Deprecated usage of @ and ` at the beginning of an unquoted string
  * Deprecated non-escaped \ in double-quoted strings when parsing Yaml
    ("Foo\Var" is not valid whereas "Foo\\Var" is)
 
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -236,6 +236,14 @@ public static function parseScalar($scalar, $delimiters = null, $stringDelimiter
                 throw new ParseException(sprintf('Malformed inline YAML string (%s).', $scalar));
             }
 
+            // a non-quoted string cannot start with @ or ` (reserved)
+            if ($output && ('@' === $output[0] || '`' === $output[0])) {
+                @trigger_error(sprintf('Not quoting a scalar starting with "%s" is deprecated since Symfony 2.8 and will throw a ParseException in 3.0.', $output[0]), E_USER_DEPRECATED);
+
+                // to be thrown in 3.0
+                // throw new ParseException(sprintf('The reserved indicator "%s" cannot start a plain scalar; you need to quote the scalar.', $output[0]));
+            }
+
             if ($evaluate) {
                 $output = self::evaluateScalar($output, $references);
             }
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -190,6 +190,21 @@ public function testParseUnquotedAsteriskFollowedByAComment()
         Inline::parse('{ foo: * #foo }');
     }
 
+    /**
+     * @group legacy
+     * @dataProvider getReservedIndicators
+     * throws \Symfony\Component\Yaml\Exception\ParseException in 3.0
+     */
+    public function testParseUnquotedScalarStartingWithReservedIndicator($indicator)
+    {
+        Inline::parse(sprintf('{ foo: %sfoo }', $indicator));
+    }
+
+    public function getReservedIndicators()
+    {
+        return array(array('@'), array('`'));
+    }
+
     public function getTestsForParse()
     {
         return array(

Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,14 @@ public static function parseScalar($scalar, $delimiters = null, $stringDelimiter`
`236`	`236`	`throw new ParseException(sprintf('Malformed inline YAML string (%s).', $scalar));`
`237`	`237`	`}`
`238`	`238`
	`239`	+ // a non-quoted string cannot start with @ or ` (reserved)
	`240`	+ if ($output && ('@' === $output[0] \|\| '`' === $output[0])) {
	`241`	`+ @trigger_error(sprintf('Not quoting a scalar starting with "%s" is deprecated since Symfony 2.8 and will throw a ParseException in 3.0.', $output[0]), E_USER_DEPRECATED);`
	`242`	`+`
	`243`	`+ // to be thrown in 3.0`
	`244`	`+ // throw new ParseException(sprintf('The reserved indicator "%s" cannot start a plain scalar; you need to quote the scalar.', $output[0]));`
	`245`	`+ }`
	`246`	`+`
`239`	`247`	`if ($evaluate) {`
`240`	`248`	`$output = self::evaluateScalar($output, $references);`
`241`	`249`	`}`