#9105 Remove white spaces from yml parameter with html

piotrpasich · piotrpasich · commit 3ca9d2dba5f4 · 2013-12-14T11:55:37.000+01:00
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -482,6 +482,7 @@ private function parseFoldedScalar($separator, $indicator = '', $indentation = 0
         if ('>' === $separator) {
             preg_match('/(\n*)$/', $text, $matches);
             $text = preg_replace('/(?<!\n)\n(?!\n)/', ' ', rtrim($text, "\n"));
+            $text = preg_replace('/>\s+</', '><', $text);
             $text .= $matches[1];
         }
 
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -611,6 +611,42 @@ public function testNestedFoldedStringBlockWithComments()
 EOF
         ));
     }
+
+    public function testHtmlStringWithWhiteSpaces()
+    {
+        $this->assertEquals(array('test' => <<<EOT
+<h2>A heading</h2><ul><li>a list</li><li>may be a good example</li></ul>
+EOT
+        ), Yaml::parse(<<<EOF
+test: >
+    <h2>A heading</h2>
+
+    <ul>
+        <li>a list</li>
+        <li>may be a good example</li>
+    </ul>
+EOF
+        ));
+
+        $this->assertEquals(array('test' => <<<EOT
+<h2> 3 < 4 </h2>
+EOT
+        ), Yaml::parse(<<<EOF
+test: >
+    <h2> 3 < 4 </h2>
+EOF
+        ));
+
+        $this->assertEquals(array('test' => <<<EOT
+<h2> 4 > 3 </h2>
+EOT
+        ), Yaml::parse(<<<EOF
+test: >
+    <h2> 4 > 3 </h2>
+EOF
+        ));
+
+    }
 }
 
 class B

Original file line number	Diff line number	Diff line change
`@@ -482,6 +482,7 @@ private function parseFoldedScalar($separator, $indicator = '', $indentation = 0`
`482`	`482`	`if ('>' === $separator) {`
`483`	`483`	`preg_match('/(\n*)$/', $text, $matches);`
`484`	`484`	`$text = preg_replace('/(?<!\n)\n(?!\n)/', ' ', rtrim($text, "\n"));`
	`485`	`+ $text = preg_replace('/>\s+</', '><', $text);`
`485`	`486`	`$text .= $matches[1];`
`486`	`487`	`}`
`487`	`488`