bug symfony#20732 fix the inline level for dumped multi-line strings (xabbuh)

fabpot · fabpot · commit b699e4b77b0a · 2016-12-03T12:35:23.000+01:00
This PR was merged into the 3.1 branch. Discussion ---------- fix the inline level for dumped multi-line strings | Q | A | ------------- | --- | Branch? | 3.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#20706 | License | MIT | Doc PR | Commits ------- 5269796 fix the inline level for dumped multi-line strings
diff --git a/src/Symfony/Component/Yaml/Dumper.php b/src/Symfony/Component/Yaml/Dumper.php
@@ -88,7 +88,7 @@ public function dump($input, $inline = 0, $indent = 0, $flags = 0)
             $isAHash = Inline::isHash($input);
 
             foreach ($input as $key => $value) {
-                if ($inline > 1 && Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && is_string($value) && false !== strpos($value, "\n")) {
+                if ($inline >= 1 && Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && is_string($value) && false !== strpos($value, "\n")) {
                     $output .= sprintf("%s%s%s |\n", $prefix, $isAHash ? Inline::dump($key, $flags).':' : '-', '');
 
                     foreach (preg_split('/\n|\r\n/', $value) as $row) {
diff --git a/src/Symfony/Component/Yaml/Tests/DumperTest.php b/src/Symfony/Component/Yaml/Tests/DumperTest.php
@@ -342,7 +342,7 @@ public function testDumpMultiLineStringAsScalarBlock()
             ),
         );
 
-        $this->assertSame(file_get_contents(__DIR__.'/Fixtures/multiple_lines_as_literal_block.yml'), $this->dumper->dump($data, 3, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));
+        $this->assertSame(file_get_contents(__DIR__.'/Fixtures/multiple_lines_as_literal_block.yml'), $this->dumper->dump($data, 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));
     }
 
     /**
diff --git a/src/Symfony/Component/Yaml/Tests/Fixtures/multiple_lines_as_literal_block.yml b/src/Symfony/Component/Yaml/Tests/Fixtures/multiple_lines_as_literal_block.yml
@@ -10,5 +10,4 @@ data:
         empty line:
         
         baz
-    nested_inlined_multi_line_string:
-        inlined_multi_line: "foo\nbar\r\nempty line:\n\nbaz"
+    nested_inlined_multi_line_string: { inlined_multi_line: "foo\nbar\r\nempty line:\n\nbaz" }

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ public function testDumpMultiLineStringAsScalarBlock()`
`342`	`342`	`),`
`343`	`343`	`);`
`344`	`344`
`345`		`- $this->assertSame(file_get_contents(__DIR__.'/Fixtures/multiple_lines_as_literal_block.yml'), $this->dumper->dump($data, 3, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));`
	`345`	`+ $this->assertSame(file_get_contents(__DIR__.'/Fixtures/multiple_lines_as_literal_block.yml'), $this->dumper->dump($data, 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`/**`