[Yaml] Throw exception for invalid tagged scalar

gharlan · gharlan · commit a1b9968bb3f5 · 2019-10-15T11:17:19.000+02:00
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -94,15 +94,15 @@ public static function parse(string $value = null, int $flags = 0, array $refere
                     $result = self::parseScalar($value, $flags, null, $i, null === $tag, $references);
             }
 
-            if (null !== $tag && '' !== $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 && '' !== $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
@@ -141,6 +141,13 @@ public function testParseScalarWithIncorrectlyDoubleQuotedStringShouldThrowExcep
         Inline::parse($value);
     }
 
+    public function testParseScalarWithTagAndIncorrectlyQuotedStringShouldThrowException()
+    {
+        $this->expectException(ParseException::class);
+        $value = "!foo 'don't do somthin' like that'";
+        Inline::parse($value, Yaml::PARSE_CUSTOM_TAGS);
+    }
+
     public function testParseInvalidMappingKeyShouldThrowException()
     {
         $this->expectException('Symfony\Component\Yaml\Exception\ParseException');

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,13 @@ public function testParseScalarWithIncorrectlyDoubleQuotedStringShouldThrowExcep`
`141`	`141`	`Inline::parse($value);`
`142`	`142`	`}`
`143`	`143`
	`144`	`+ public function testParseScalarWithTagAndIncorrectlyQuotedStringShouldThrowException()`
	`145`	`+ {`
	`146`	`+ $this->expectException(ParseException::class);`
	`147`	`+ $value = "!foo 'don't do somthin' like that'";`
	`148`	`+ Inline::parse($value, Yaml::PARSE_CUSTOM_TAGS);`
	`149`	`+ }`
	`150`	`+`
`144`	`151`	`public function testParseInvalidMappingKeyShouldThrowException()`
`145`	`152`	`{`
`146`	`153`	`$this->expectException('Symfony\Component\Yaml\Exception\ParseException');`