parse merge keys with PARSE_OBJECT_FOR_MAP flag

xabbuh · xabbuh · commit 414645c22da9 · 2017-09-13T19:47:55.000+02:00
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -249,19 +249,25 @@ private function doParse($value, $flags)
                 if ('<<' === $key) {
                     $mergeNode = true;
                     $allowOverwrite = true;
-                    if (isset($values['value']) && 0 === strpos($values['value'], '*')) {
+                    if (isset($values['value']) && isset($values['value'][0]) && '*' === $values['value'][0]) {
                         $refName = substr(rtrim($values['value']), 1);
                         if (!array_key_exists($refName, $this->refs)) {
                             throw new ParseException(sprintf('Reference "%s" does not exist.', $refName), $this->getRealCurrentLineNb() + 1, $this->currentLine);
                         }
 
                         $refValue = $this->refs[$refName];
 
-                        if (!is_array($refValue)) {
+                        if (is_array($refValue)) {
+                            $data += $refValue; // array union
+                        } elseif ((bool) (Yaml::PARSE_OBJECT_FOR_MAP & $flags) && $refValue instanceof \stdClass) {
+                            foreach ($refValue as $refValueKey => $refValueValue) {
+                                if (!isset($data[$refValueKey])) {
+                                    $data[$refValueKey] = $refValueValue;
+                                }
+                            }
+                        } else {
                             throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
                         }
-
-                        $data += $refValue; // array union
                     } else {
                         if (isset($values['value']) && $values['value'] !== '') {
                             $value = $values['value'];
@@ -270,25 +276,31 @@ private function doParse($value, $flags)
                         }
                         $parsed = $this->parseBlock($this->getRealCurrentLineNb() + 1, $value, $flags);
 
-                        if (!is_array($parsed)) {
-                            throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
-                        }
-
-                        if (isset($parsed[0])) {
-                            // If the value associated with the merge key is a sequence, then this sequence is expected to contain mapping nodes
-                            // and each of these nodes is merged in turn according to its order in the sequence. Keys in mapping nodes earlier
-                            // in the sequence override keys specified in later mapping nodes.
-                            foreach ($parsed as $parsedItem) {
-                                if (!is_array($parsedItem)) {
-                                    throw new ParseException('Merge items must be arrays.', $this->getRealCurrentLineNb() + 1, $parsedItem);
+                        if (is_array($parsed)) {
+                            if (isset($parsed[0])) {
+                                // If the value associated with the merge key is a sequence, then this sequence is expected to contain mapping nodes
+                                // and each of these nodes is merged in turn according to its order in the sequence. Keys in mapping nodes earlier
+                                // in the sequence override keys specified in later mapping nodes.
+                                foreach ($parsed as $parsedItem) {
+                                    if (!is_array($parsedItem)) {
+                                        throw new ParseException('Merge items must be arrays.', $this->getRealCurrentLineNb() + 1, $parsedItem);
+                                    }
+
+                                    $data += $parsedItem; // array union
+                                }
+                            } else {
+                                // If the value associated with the key is a single mapping node, each of its key/value pairs is inserted into the
+                                // current mapping, unless the key already exists in it.
+                                $data += $parsed; // array union
+                            }
+                        } elseif ((bool) (Yaml::PARSE_OBJECT_FOR_MAP & $flags) && $parsed instanceof \stdClass) {
+                            foreach ($parsed as $parsedKey => $parsedValue) {
+                                if (!isset($data[$parsedKey])) {
+                                    $data[$parsedKey] = $parsedValue;
                                 }
-
-                                $data += $parsedItem; // array union
                             }
                         } else {
-                            // If the value associated with the key is a single mapping node, each of its key/value pairs is inserted into the
-                            // current mapping, unless the key already exists in it.
-                            $data += $parsed; // array union
+                            throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
                         }
                     }
                 } elseif (isset($values['value']) && self::preg_match('#^&(?P<ref>[^ ]++) *+(?P<value>.*)#u', $values['value'], $matches)) {
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -1865,6 +1865,38 @@ public function testPhpConstantTagMappingKeyWithKeysCastToStrings()
 
         $this->assertSame($expected, $this->parser->parse($yaml, Yaml::PARSE_CONSTANT | Yaml::PARSE_KEYS_AS_STRINGS));
     }
+
+    public function testMergeKeysWhenMappingsAreParsedAsObjects()
+    {
+        $yaml = <<<YAML
+aaa: &A
+  bbb: 1
+
+ccc:
+  ddd: 2
+  <<: *A
+
+eee:
+  fff: 3
+  <<:
+    ggg: 4
+YAML;
+        $expected = (object) array(
+            'aaa' => (object) array(
+                'bbb' => 1,
+            ),
+            'ccc' => (object) array(
+                'ddd' => 2,
+                'bbb' => 1,
+            ),
+            'eee' => (object) array(
+                'fff' => 3,
+                'ggg' => 4,
+            ),
+        );
+
+        $this->assertEquals($expected, $this->parser->parse($yaml, Yaml::PARSE_OBJECT_FOR_MAP));
+    }
 }
 
 class B
