Pārlūkot izejas kodu

[Yaml] reverted previous commit

Fabien Potencier 15 gadi atpakaļ
vecāks
revīzija
a248fc133b

+ 5 - 2
src/Symfony/Components/Yaml/Parser.php

@@ -300,9 +300,12 @@ class Parser
 
     while ($this->moveToNextLine())
     {
-      if ($this->isCurrentLineBlank())
+      if ($this->isCurrentLineEmpty())
       {
-        $data[] = substr($this->currentLine, $newIndent);
+        if ($this->isCurrentLineBlank())
+        {
+          $data[] = substr($this->currentLine, $newIndent);
+        }
 
         continue;
       }

+ 0 - 28
tests/fixtures/Symfony/Components/Yaml/sfTests.yml

@@ -143,31 +143,3 @@ yaml: |
     0123
 php: |
   array('foo' => "0123\n")
----
-test: Comments in folded scalars
-brief: Comments in folded scalars should be kept as is
-yaml: |
-  # comment
-  foo: |
-    # comment
-    bar
-  bar:
-    # comment
-    foo: bar # comment
-    bar: |
-      # comment
-      foo
-    foobar:
-      foo: |
-        # comment
-        bar
-  # comment
-php: |
-  array(
-    'foo' => "# comment\nbar\n",
-    'bar' => array(
-      'foo' => 'bar',
-      'bar' => "# comment\nfoo\n",
-      'foobar' => array('foo' => "# comment\nbar\n")
-    )
-  )