Fixed list handing when dealing with object maps

symfony · johnknl · Feb 6, 2016 · Feb 6, 2016 · Feb 6, 2016 · Feb 6, 2016
commit 91df68215829c7366ae3be844197c68781c36657
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -302,7 +302,13 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
        }

        if ($objectForMap && !is_object($data)) {
-            $data = (object) $data;
+            if (is_array($data)) {
+                foreach (array_keys($data) as $index => $key) {
+                    if ($index !== $key) {
+                        return empty($data) ? null : (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
@@ -479,6 +479,24 @@ public function testObjectForMapIsAppliedAfterParsing()
        $this->assertEquals($expected, $this->parser->parse("foo: bar\nbaz: foobar", false, false, true));
    }

+    public function testWillObjectForMapOptionWillIgnoreArrays()
+    {
+        $yaml = <<<YAML
+array:
+  - key: one
+  - key: two
+YAML;
+
+        $actual = $this->parser->parse($yaml, true, false, true);
+        $this->assertInternalType('object', $actual);
+
+        $this->assertInternalType('array', $actual->array);
+        $this->assertInternalType('object', $actual->array[0]);
+        $this->assertInternalType('object', $actual->array[1]);
+        $this->assertSame('one', $actual->array[0]->key);
+        $this->assertSame('two', $actual->array[1]->key);
+    }
+
    /**
     * @dataProvider invalidDumpedObjectProvider
     * @expectedException \Symfony\Component\Yaml\Exception\ParseException