bug #33818 [Yaml] Throw exception for tagged invalid inline elements (gharlan)

xabbuh · xabbuh · commit 52f8fc839c5c · 2019-10-18T11:15:32.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [Yaml] Throw exception for tagged invalid inline elements | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | n/a | License | MIT | Doc PR | n/a At the moment the result for `!foo 'don't do somthin' like that'` is a `TaggedValue` with value "don". Commits ------- bed479c [Yaml] Throw exception for tagged invalid inline elements
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -126,15 +126,15 @@ public static function parse($value, $flags = 0, $references = [])
                     $result = self::parseScalar($value, $flags, null, $i, null === $tag, $references);
             }
 
-            if (null !== $tag) {
-                return new TaggedValue($tag, $result);
-            }
-
             // some comments are allowed at the end
             if (preg_replace('/\s+#.*$/A', '', substr($value, $i))) {
                 throw new ParseException(sprintf('Unexpected characters near "%s".', substr($value, $i)), self::$parsedLineNumber + 1, $value, self::$parsedFilename);
             }
 
+            if (null !== $tag) {
+                return new TaggedValue($tag, $result);
+            }
+
             return $result;
         } finally {
             if (isset($mbEncoding)) {
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -201,6 +201,12 @@ public function testParseInvalidSequenceShouldThrowException()
         Inline::parse('{ foo: bar } bar');
     }
 
+    public function testParseInvalidTaggedSequenceShouldThrowException()
+    {
+        $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+        Inline::parse('!foo { bar: baz } qux', Yaml::PARSE_CUSTOM_TAGS);
+    }
+
     public function testParseScalarWithCorrectlyQuotedStringShouldReturnString()
     {
         $value = "'don''t do somthin'' like that'";

Original file line number	Diff line number	Diff line change
`@@ -201,6 +201,12 @@ public function testParseInvalidSequenceShouldThrowException()`
`201`	`201`	`Inline::parse('{ foo: bar } bar');`
`202`	`202`	`}`
`203`	`203`
	`204`	`+ public function testParseInvalidTaggedSequenceShouldThrowException()`
	`205`	`+ {`
	`206`	`+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');`
	`207`	`+ Inline::parse('!foo { bar: baz } qux', Yaml::PARSE_CUSTOM_TAGS);`
	`208`	`+ }`
	`209`	`+`
`204`	`210`	`public function testParseScalarWithCorrectlyQuotedStringShouldReturnString()`
`205`	`211`	`{`
`206`	`212`	`$value = "'don''t do somthin'' like that'";`