bug #17197 [Yaml] cast arrays to objects after parsing has finished (xabbuh)

fabpot · fabpot · commit 59915652862e · 2016-01-04T17:50:38.000+01:00
This PR was merged into the 2.8 branch. Discussion ---------- [Yaml] cast arrays to objects after parsing has finished | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #17190 | License | MIT | Doc PR | Casting arrays to objects must happen after the complete YAML string has been parsed to avoid errors when parsing subsequent lines. Commits ------- 8251d67 cast arrays to objects after parsing has finished
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -240,10 +240,6 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
                 if ($isRef) {
                     $this->refs[$isRef] = $data[$key];
                 }
-
-                if ($objectForMap && !is_object($data)) {
-                    $data = (object) $data;
-                }
             } else {
                 // multiple documents are not supported
                 if ('---' === $this->currentLine) {
@@ -307,6 +303,10 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
             mb_internal_encoding($mbEncoding);
         }
 
+        if ($objectForMap && !is_object($data)) {
+            $data = (object) $data;
+        }
+
         return empty($data) ? null : $data;
     }
 
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -460,6 +460,15 @@ public function testObjectForMapEnabledWithInlineMapping()
         $this->assertEquals('cat', $result->fiz);
     }
 
+    public function testObjectForMapIsAppliedAfterParsing()
+    {
+        $expected = new \stdClass();
+        $expected->foo = 'bar';
+        $expected->baz = 'foobar';
+
+        $this->assertEquals($expected, $this->parser->parse("foo: bar\nbaz: foobar", false, false, true));
+    }
+
     /**
      * @expectedException \Symfony\Component\Yaml\Exception\ParseException
      */

Original file line number	Diff line number	Diff line change
`@@ -240,10 +240,6 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =`
`240`	`240`	`if ($isRef) {`
`241`	`241`	`$this->refs[$isRef] = $data[$key];`
`242`	`242`	`}`
`243`		`-`
`244`		`- if ($objectForMap && !is_object($data)) {`
`245`		`- $data = (object) $data;`
`246`		`- }`
`247`	`243`	`} else {`
`248`	`244`	`// multiple documents are not supported`
`249`	`245`	`if ('---' === $this->currentLine) {`
`@@ -307,6 +303,10 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =`
`307`	`303`	`mb_internal_encoding($mbEncoding);`
`308`	`304`	`}`
`309`	`305`
	`306`	`+ if ($objectForMap && !is_object($data)) {`
	`307`	`+ $data = (object) $data;`
	`308`	`+ }`
	`309`	`+`
`310`	`310`	`return empty($data) ? null : $data;`
`311`	`311`	`}`
`312`	`312`