[Yaml] parse custom tags for scalars

xabbuh · xabbuh · commit f645ce83c76e · 2017-06-26T08:44:57.000+02:00
diff --git a/src/Symfony/Component/Yaml/CHANGELOG.md b/src/Symfony/Component/Yaml/CHANGELOG.md
@@ -4,6 +4,9 @@ CHANGELOG
 4.0.0
 -----
 
+ * Inlined scalars starting with `!` will no longer be parsed as plain strings.
+   Use the `Yaml::PARSE_CUSTOM_TAGS` flah to parse them as `TaggedValue` objects.
+   Otherwise, detecting such strings will throw a `ParseException`.
  * The behavior of the non-specific tag `!` is changed and now forces
    non-evaluating your values.
  * complex mappings will throw a `ParseException`
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -582,7 +582,14 @@ private static function evaluateScalar($scalar, $flags, $references = array())
                     case 0 === strpos($scalar, '!!binary '):
                         return self::evaluateBinaryScalar(substr($scalar, 9));
                     default:
-                        @trigger_error(sprintf('Using the unquoted scalar value "%s" is deprecated since version 3.3 and will be considered as a tagged value in 4.0. You must quote it.', $scalar), E_USER_DEPRECATED);
+                        $tagLength = strcspn($scalar, " \t\n", 1);
+                        $tag = substr($scalar, 1, $tagLength);
+
+                        if (Yaml::PARSE_CUSTOM_TAGS & $flags) {
+                            return new TaggedValue($tag, substr($scalar, $tagLength + 2));
+                        }
+
+                        throw new ParseException(sprintf('Tags support is not enabled. You must use the `Yaml::PARSE_CUSTOM_TAGS` flag to use "!%s".', $tag), self::$parsedLineNumber + 1, $scalar);
                 }
 
             // Optimize for returning strings.
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -703,4 +703,13 @@ public function getNotPhpCompatibleMappingKeyData()
             'float' => array('{0.25: "foo"}', array('0.25' => 'foo')),
         );
     }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     * @expectedExceptionMessage Tags support is not enabled. You must use the `Yaml::PARSE_CUSTOM_TAGS` flag to use "!iterator" at line 1 (near "!iterator foo").
+     */
+    public function testCustomTagsDisabled()
+    {
+        Inline::parse('!iterator foo');
+    }
 }
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -1566,6 +1566,10 @@ public function taggedValuesProvider()
 - !quz {foo: bar, quz: !bar {one: bar}}
 YAML
             ),
+            'tagged scalar' => array(
+                new TaggedValue('iterator', 'foo'),
+                '!iterator foo',
+            ),
         );
     }
 
@@ -1578,15 +1582,6 @@ public function testCustomTagsDisabled()
         $this->parser->parse('!iterator [foo]');
     }
 
-    /**
-     * @group legacy
-     * @expectedDeprecation Using the unquoted scalar value "!iterator foo" is deprecated since version 3.3 and will be considered as a tagged value in 4.0. You must quote it.
-     */
-    public function testUnsupportedTagWithScalar()
-    {
-        $this->assertEquals('!iterator foo', $this->parser->parse('!iterator foo'));
-    }
-
     /**
      * @expectedException \Symfony\Component\Yaml\Exception\ParseException
      * @expectedExceptionMessage The built-in tag "!!foo" is not implemented.

Original file line number	Diff line number	Diff line change
`@@ -703,4 +703,13 @@ public function getNotPhpCompatibleMappingKeyData()`
`703`	`703`	`'float' => array('{0.25: "foo"}', array('0.25' => 'foo')),`
`704`	`704`	`);`
`705`	`705`	`}`
	`706`	`+`
	`707`	`+ /**`
	`708`	`+ * @expectedException \Symfony\Component\Yaml\Exception\ParseException`
	`709`	+ * @expectedExceptionMessage Tags support is not enabled. You must use the `Yaml::PARSE_CUSTOM_TAGS` flag to use "!iterator" at line 1 (near "!iterator foo").
	`710`	`+ */`
	`711`	`+ public function testCustomTagsDisabled()`
	`712`	`+ {`
	`713`	`+ Inline::parse('!iterator foo');`
	`714`	`+ }`
`706`	`715`	`}`