Merge branch '2.8'

fabpot · fabpot · commit 094ca41a5f89 · 2015-10-02T14:38:08.000+02:00
* 2.8: [Yaml] Add regression test for comments indents Fix the DomCrawler tests Revert "bug #15860 [Yaml] Fix improper comments removal (ogizanagi)"
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -313,14 +313,6 @@ public function addNodes(array $nodes)
      */
     public function addNode(\DOMNode $node)
     {
-        if (null !== $this->document && $this->document !== $node->ownerDocument) {
-            @trigger_error('Attaching DOM nodes from multiple documents in a Crawler is deprecated as of 2.8 and will be forbidden in 3.0.', E_USER_DEPRECATED);
-        }
-
-        if (null === $this->document) {
-            $this->document = $node->ownerDocument;
-        }
-
         if ($node instanceof \DOMDocument) {
             $node = $node->documentElement;
         }
@@ -329,6 +321,14 @@ public function addNode(\DOMNode $node)
             throw new \InvalidArgumentException(sprintf('Nodes set in a Crawler must be DOMElement or DOMDocument instances, "%s" given.', get_class($node)));
         }
 
+        if (null !== $this->document && $this->document !== $node->ownerDocument) {
+            @trigger_error('Attaching DOM nodes from multiple documents in a Crawler is deprecated as of 2.8 and will be forbidden in 3.0.', E_USER_DEPRECATED);
+        }
+
+        if (null === $this->document) {
+            $this->document = $node->ownerDocument;
+        }
+
         parent::attach($node);
     }
 
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -375,9 +375,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;
@@ -388,6 +396,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) {
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -622,6 +622,32 @@ public function testEmptyValue()
         $this->assertEquals(array('hash' => null), Yaml::parse($input));
     }
 
+    public function testCommentAtTheRootIndent()
+    {
+        $this->assertEquals(array(
+            'services' => array(
+                'app.foo_service' => array(
+                    'class' => 'Foo',
+                ),
+                'app/bar_service' => array(
+                    'class' => 'Bar',
+                ),
+            ),
+        ), Yaml::parse(<<<EOF
+# comment 1
+services:
+# comment 2
+    # comment 3
+    app.foo_service:
+        class: Foo
+# comment 4
+    # comment 5
+    app/bar_service:
+        class: Bar
+EOF
+        ));
+    }
+
     public function testStringBlockWithComments()
     {
         $this->assertEquals(array('content' => <<<EOT
@@ -679,43 +705,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(
