symfony
diff --git a/‎src/Symfony/Component/Yaml/Parser.php
Lines changed: 12 additions & 0 deletions b/‎src/Symfony/Component/Yaml/Parser.php
Lines changed: 12 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Yaml/Tests/ParserTest.php
Lines changed: 0 additions & 37 deletions b/‎src/Symfony/Component/Yaml/Tests/ParserTest.php
Lines changed: 0 additions & 37 deletions
@@ -339,9 +339,17 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)
 
         $isItUnindentedCollection = $this->isStringUnIndentedCollectionItem($this->currentLine);
 
+        // Comments must not be removed inside a block scalar
+        $removeCommentsPattern = '~'.self::BLOCK_SCALAR_HEADER_PATTERN.'$~';
+        $removeComments = !preg_match($removeCommentsPattern, $this->currentLine);
+
         while ($this->moveToNextLine()) {
             $indent = $this->getCurrentLineIndentation();
 
+            if ($indent === $newIndent) {
+                $removeComments = !preg_match($removeCommentsPattern, $this->currentLine);
+            }
+
             if ($isItUnindentedCollection && !$this->isStringUnIndentedCollectionItem($this->currentLine) && $newIndent === $indent) {
                 $this->moveToPreviousLine();
                 break;
@@ -352,6 +360,10 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)
                 continue;
             }
 
+            if ($removeComments && $this->isCurrentLineComment()) {
+                continue;
+            }
+
             if ($indent >= $newIndent) {
                 $data[] = substr($this->currentLine, $newIndent);
             } elseif (0 == $indent) {
 
@@ -617,43 +617,6 @@ public function testFoldedStringBlockWithComments()
         ));
     }
 
-    public function testSecondLevelFoldedStringBlockWithComments()
-    {
-        $this->assertEquals(array(
-            'pages' => array(
-                array(
-                    'title' => 'some title',
-                    'content' => <<<EOT
-# comment 1
-header
-
-    # comment 2
-    <body>
-        <h1>title</h1>
-    </body>
-
-footer # comment3
-EOT
-                ),
-            ),
-        ), Yaml::parse(<<<EOF
-pages:
-    -
-        title: some title
-        content: |
-            # comment 1
-            header
-
-                # comment 2
-                <body>
-                    <h1>title</h1>
-                </body>
-
-            footer # comment3
-EOF
-        ));
-    }
-
     public function testNestedFoldedStringBlockWithComments()
     {
         $this->assertEquals(array(array(