Dumper + DumperTest: Fix TaggedValue in top level.

donquixote · donquixote · commit 3fe757026d43 · 2022-08-03T03:09:12.000+02:00
diff --git a/src/Symfony/Component/Yaml/Dumper.php b/src/Symfony/Component/Yaml/Dumper.php
@@ -60,8 +60,20 @@ public function dump($input, int $inline = 0, int $indent = 0, int $flags = 0):
     {
         $prefix = $indent ? str_repeat(' ', $indent) : '';
 
+        $tag = null;
+        if ($input instanceof TaggedValue) {
+            $tag = $input->getTag();
+            $input = $input->getValue();
+            if ($input instanceof TaggedValue) {
+                throw new \InvalidArgumentException('Nested tags are not supported.');
+            }
+        }
+
         if ($this->shouldDumpAsInline($inline, $input, $flags)) {
-            return $prefix.Inline::dump($input, $flags);
+            return $prefix
+                .(null !== $tag ? '!'.$tag.' ' : '')
+                .Inline::dump($input, $flags)
+            ;
         }
 
         $dumpAsMap = Inline::isHash($input);
@@ -122,6 +134,10 @@ public function dump($input, int $inline = 0, int $indent = 0, int $flags = 0):
             ;
         }
 
+        if (null !== $tag) {
+            $output = '!'.$tag."\n".$output;
+        }
+
         return $output;
     }
 
@@ -131,7 +147,7 @@ private function shouldDumpAsInline(int $inline, $value, int $flags): bool
             return true;
         }
 
-        if (\is_array($value) || $value instanceof TaggedValue) {
+        if (\is_array($value)) {
             return false;
         }
 
diff --git a/src/Symfony/Component/Yaml/Tests/DumperTest.php b/src/Symfony/Component/Yaml/Tests/DumperTest.php
@@ -443,20 +443,20 @@ public function testDumpingTaggedValueTopLevelAssocInline()
     public function testDumpingTaggedValueTopLevelAssoc()
     {
         $data = new TaggedValue('user', ['name' => 'jane']);
+        $expected = <<<'YAML'
+!user
+name: jane
 
-        // @todo Fix the dumper, the output should not be ''.
-        $expected = '';
-        $yaml = $this->dumper->dump($data, 2);
-        $this->assertSame($expected, $yaml);
+YAML;
+        $this->assertSame($expected, $this->dumper->dump($data, 2));
     }
 
     public function testDumpingTaggedValueTopLevelMultiLine()
     {
         $data = new TaggedValue('text', "a\nb\n");
-
-        // @todo Fix the dumper, the output should not be ''.
-        $expected = '';
+        $expected = '!text "a\\nb\\n"';
         $this->assertSame($expected, $this->dumper->dump($data, 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));
+        $this->assertEquals($data, $this->parser->parse($expected, Yaml::PARSE_CUSTOM_TAGS));
     }
 
     public function testDumpingTaggedValueSpecialCharsInTag()

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,20 @@ public function dump($input, int $inline = 0, int $indent = 0, int $flags = 0):`
`60`	`60`	`{`
`61`	`61`	`$prefix = $indent ? str_repeat(' ', $indent) : '';`
`62`	`62`
	`63`	`+ $tag = null;`
	`64`	`+ if ($input instanceof TaggedValue) {`
	`65`	`+ $tag = $input->getTag();`
	`66`	`+ $input = $input->getValue();`
	`67`	`+ if ($input instanceof TaggedValue) {`
	`68`	`+ throw new \InvalidArgumentException('Nested tags are not supported.');`
	`69`	`+ }`
	`70`	`+ }`
	`71`	`+`
`63`	`72`	`if ($this->shouldDumpAsInline($inline, $input, $flags)) {`
`64`		`- return $prefix.Inline::dump($input, $flags);`
	`73`	`+ return $prefix`
	`74`	`+ .(null !== $tag ? '!'.$tag.' ' : '')`
	`75`	`+ .Inline::dump($input, $flags)`
	`76`	`+ ;`
`65`	`77`	`}`
`66`	`78`
`67`	`79`	`$dumpAsMap = Inline::isHash($input);`
`@@ -122,6 +134,10 @@ public function dump($input, int $inline = 0, int $indent = 0, int $flags = 0):`
`122`	`134`	`;`
`123`	`135`	`}`
`124`	`136`
	`137`	`+ if (null !== $tag) {`
	`138`	`+ $output = '!'.$tag."\n".$output;`
	`139`	`+ }`
	`140`	`+`
`125`	`141`	`return $output;`
`126`	`142`	`}`
`127`	`143`
`@@ -131,7 +147,7 @@ private function shouldDumpAsInline(int $inline, $value, int $flags): bool`
`131`	`147`	`return true;`
`132`	`148`	`}`
`133`	`149`
`134`		`- if (\is_array($value) \|\| $value instanceof TaggedValue) {`
	`150`	`+ if (\is_array($value)) {`
`135`	`151`	`return false;`
`136`	`152`	`}`
`137`	`153`