Minor tweak

symfony · johnknl · Feb 6, 2016 · Feb 6, 2016 · Feb 6, 2016 · Feb 6, 2016
commit a43a6363857ebc4d6073a3b43dbb6e794f9fcfb9
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -301,12 +301,10 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
            mb_internal_encoding($mbEncoding);
        }

-        if ($objectForMap && !is_object($data)) {
-            if (is_array($data)) {
-                foreach (array_keys($data) as $index => $key) {
-                    if ($index !== $key) {
-                        return empty($data) ? null : (object) $data;
-                    }
+        if ($objectForMap && is_array($data)) {
+            foreach (array_keys($data) as $index => $key) {
+                if ($index !== $key) {
+                    return (object) $data;
                }
            }
        }

diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -496,6 +496,17 @@ public function testWillObjectForMapOptionWillIgnoreArrays()
        $this->assertSame('two', $actual->array[1]->key);
    }

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