[Yaml] parse inlined tags without values

xabbuh · xabbuh · commit cc56340c65bf · 2017-08-02T09:15:14.000+02:00
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -351,7 +351,8 @@ private static function parseSequence($sequence, $flags, &$i = 0, $references =
                 continue;
             }
 
-            $tag = self::parseTag($sequence, $i, $flags);
+            $isQuoted = false;
+            $tag = self::parseTag($sequence, $i, $flags, ']');
             switch ($sequence[$i]) {
                 case '[':
                     // nested sequence
@@ -380,6 +381,10 @@ private static function parseSequence($sequence, $flags, &$i = 0, $references =
             }
 
             if (null !== $tag && '' !== $tag) {
+                if ('' === $value && !$isQuoted) {
+                    $value = null;
+                }
+
                 $value = new TaggedValue($tag, $value);
             }
 
@@ -456,7 +461,8 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
                     continue;
                 }
 
-                $tag = self::parseTag($mapping, $i, $flags);
+                $isValueQuoted = false;
+                $tag = self::parseTag($mapping, $i, $flags, '}');
                 switch ($mapping[$i]) {
                     case '[':
                         // nested sequence
@@ -479,6 +485,7 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
                         }
                         break;
                     default:
+                        $isValueQuoted = in_array($mapping[$i], array('"', "'"));
                         $value = self::parseScalar($mapping, $flags, array(',', '}'), $i, null === $tag, $references);
                         // Spec: Keys MUST be unique; first one wins.
                         // Parser cannot abort this mapping earlier, since lines
@@ -490,6 +497,10 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
                 }
 
                 if (null !== $tag && '' !== $tag) {
+                    if ('' === $value && !$isValueQuoted) {
+                        $value = null;
+                    }
+
                     $output[$key] = new TaggedValue($tag, $value);
                 } else {
                     $output[$key] = $value;
@@ -635,16 +646,17 @@ private static function evaluateScalar($scalar, $flags, $references = array())
      * @param string $value
      * @param int    &$i
      * @param int    $flags
+     * @param string $stopOn
      *
      * @return null|string
      */
-    private static function parseTag($value, &$i, $flags)
+    private static function parseTag($value, &$i, $flags, $stopOn = '')
     {
         if ('!' !== $value[$i]) {
             return;
         }
 
-        $tagLength = strcspn($value, " \t\n", $i + 1);
+        $tagLength = strcspn($value, " \t\n".$stopOn, $i + 1);
         $tag = substr($value, $i + 1, $tagLength);
 
         $nextOffset = $i + $tagLength + 1;
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Inline;
+use Symfony\Component\Yaml\Tag\TaggedValue;
 use Symfony\Component\Yaml\Yaml;
 
 class InlineTest extends TestCase
@@ -703,4 +704,40 @@ public function getNotPhpCompatibleMappingKeyData()
             'float' => array('{0.25: "foo"}', array('0.25' => 'foo')),
         );
     }
+
+    public function testTagWithoutValueInSequence()
+    {
+        $value = Inline::parse('[!foo]', Yaml::PARSE_CUSTOM_TAGS);
+
+        $this->assertInstanceOf(TaggedValue::class, $value[0]);
+        $this->assertSame('foo', $value[0]->getTag());
+        $this->assertNull($value[0]->getValue());
+    }
+
+    public function testTagWithEmptyValueInSequence()
+    {
+        $value = Inline::parse('[!foo ""]', Yaml::PARSE_CUSTOM_TAGS);
+
+        $this->assertInstanceOf(TaggedValue::class, $value[0]);
+        $this->assertSame('foo', $value[0]->getTag());
+        $this->assertSame('', $value[0]->getValue());
+    }
+
+    public function testTagWithoutValueInMapping()
+    {
+        $value = Inline::parse('{foo: !bar}', Yaml::PARSE_CUSTOM_TAGS);
+
+        $this->assertInstanceOf(TaggedValue::class, $value['foo']);
+        $this->assertSame('bar', $value['foo']->getTag());
+        $this->assertNull($value['foo']->getValue());
+    }
+
+    public function testTagWithEmptyValueInMapping()
+    {
+        $value = Inline::parse('{foo: !bar ""}', Yaml::PARSE_CUSTOM_TAGS);
+
+        $this->assertInstanceOf(TaggedValue::class, $value['foo']);
+        $this->assertSame('bar', $value['foo']->getTag());
+        $this->assertSame('', $value['foo']->getValue());
+    }
 }
