[Yaml] deprecate unquoted indicator characters

xabbuh · xabbuh · commit 5f54121ffaa4 · 2015-11-04T19:38:02.000+01:00
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -236,8 +236,8 @@ 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])) {
+            // a non-quoted string cannot start with @ or ` (reserved) nor with a scalar indicator (| or >)
+            if ($output && ('@' === $output[0] || '`' === $output[0] || '|' === $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
diff --git a/src/Symfony/Component/Yaml/Tests/Fixtures/sfQuotes.yml b/src/Symfony/Component/Yaml/Tests/Fixtures/sfQuotes.yml
@@ -3,7 +3,7 @@ test: Some characters at the beginning of a string must be escaped
 brief: >
     Some characters at the beginning of a string must be escaped
 yaml: |
-    foo: | bar
+    foo: '| bar'
 php: |
     array('foo' => '| bar')
 ---
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -205,6 +205,21 @@ public function getReservedIndicators()
         return array(array('@'), array('`'));
     }
 
+    /**
+     * @group legacy
+     * @dataProvider getScalarIndicators
+     * throws \Symfony\Component\Yaml\Exception\ParseException in 3.0
+     */
+    public function testParseUnquotedScalarStartingWithScalarIndicator($indicator)
+    {
+        Inline::parse(sprintf('{ foo: %sfoo }', $indicator));
+    }
+
+    public function getScalarIndicators()
+    {
+        return array(array('|'), array('>'));
+    }
+
     public function getTestsForParse()
     {
         return array(

Original file line number	Diff line number	Diff line change
`@@ -236,8 +236,8 @@ 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])) {
	`239`	+ // a non-quoted string cannot start with @ or ` (reserved) nor with a scalar indicator (\| or >)
	`240`	+ if ($output && ('@' === $output[0] \|\| '`' === $output[0] \|\| '\|' === $output[0] \|\| '>' === $output[0])) {
`241`	`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`	`242`
`243`	`243`	`// to be thrown in 3.0`