[Yaml] parse references on merge keys

xabbuh · xabbuh · commit dab72ab9a925 · 2017-10-04T00:19:48.000+02:00
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -181,7 +181,7 @@ private function doParse($value, $exceptionOnInvalidType = false, $objectSupport
                     $key = (string) $key;
                 }
 
-                if ('<<' === $key) {
+                if ('<<' === $key && (!isset($values['value']) || !self::preg_match('#^&(?P<ref>[^ ]+)#u', $values['value'], $refMatches))) {
                     $mergeNode = true;
                     $allowOverwrite = true;
                     if (isset($values['value']) && 0 === strpos($values['value'], '*')) {
@@ -226,14 +226,14 @@ private function doParse($value, $exceptionOnInvalidType = false, $objectSupport
                             $data += $parsed; // array union
                         }
                     }
-                } elseif (isset($values['value']) && self::preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
+                } elseif ('<<' !== $key && isset($values['value']) && self::preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
                     $isRef = $matches['ref'];
                     $values['value'] = $matches['value'];
                 }
 
                 if ($mergeNode) {
                     // Merge keys
-                } elseif (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
+                } elseif (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#') || '<<' === $key) {
                     // hash
                     // if next line is less indented or equal, then it means that the current value is null
                     if (!$this->isNextLineIndented() && !$this->isNextLineUnIndentedCollection()) {
@@ -244,9 +244,13 @@ private function doParse($value, $exceptionOnInvalidType = false, $objectSupport
                         }
                     } else {
                         $value = $this->parseBlock($this->getRealCurrentLineNb() + 1, $this->getNextEmbedBlock(), $exceptionOnInvalidType, $objectSupport, $objectForMap);
-                        // Spec: Keys MUST be unique; first one wins.
-                        // But overwriting is allowed when a merge node is used in current block.
-                        if ($allowOverwrite || !isset($data[$key])) {
+
+                        if ('<<' === $key) {
+                            $this->refs[$refMatches['ref']] = $value;
+                            $data += $value;
+                        } elseif ($allowOverwrite || !isset($data[$key])) {
+                            // Spec: Keys MUST be unique; first one wins.
+                            // But overwriting is allowed when a merge node is used in current block.
                             $data[$key] = $value;
                         }
                     }
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -1179,6 +1179,34 @@ public function testParserCleansUpReferencesBetweenRuns()
 YAML;
         $this->parser->parse($yaml);
     }
+
+    public function testParseReferencesOnMergeKeys()
+    {
+        $yaml = <<<YAML
+mergekeyrefdef:
+    a: foo
+    <<: &quux
+        b: bar
+        c: baz
+mergekeyderef:
+    d: quux
+    <<: *quux
+YAML;
+        $expected = array(
+            'mergekeyrefdef' => array(
+                'a' => 'foo',
+                'b' => 'bar',
+                'c' => 'baz',
+            ),
+            'mergekeyderef' => array(
+                'd' => 'quux',
+                'b' => 'bar',
+                'c' => 'baz',
+            ),
+        );
+
+        $this->assertSame($expected, $this->parser->parse($yaml));
+    }
 }
 
 class B

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ private function doParse($value, $exceptionOnInvalidType = false, $objectSupport`
`181`	`181`	`$key = (string) $key;`
`182`	`182`	`}`
`183`	`183`
`184`		`- if ('<<' === $key) {`
	`184`	`+ if ('<<' === $key && (!isset($values['value']) \|\| !self::preg_match('#^&(?P<ref>[^ ]+)#u', $values['value'], $refMatches))) {`
`185`	`185`	`$mergeNode = true;`
`186`	`186`	`$allowOverwrite = true;`
`187`	`187`	`if (isset($values['value']) && 0 === strpos($values['value'], '*')) {`
`@@ -226,14 +226,14 @@ private function doParse($value, $exceptionOnInvalidType = false, $objectSupport`
`226`	`226`	`$data += $parsed; // array union`
`227`	`227`	`}`
`228`	`228`	`}`
`229`		`- } elseif (isset($values['value']) && self::preg_match('#^&(?P<ref>[^ ]+) (?P<value>.)#u', $values['value'], $matches)) {`
	`229`	`+ } elseif ('<<' !== $key && isset($values['value']) && self::preg_match('#^&(?P<ref>[^ ]+) (?P<value>.)#u', $values['value'], $matches)) {`
`230`	`230`	`$isRef = $matches['ref'];`
`231`	`231`	`$values['value'] = $matches['value'];`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`if ($mergeNode) {`
`235`	`235`	`// Merge keys`
`236`		`- } elseif (!isset($values['value']) \|\| '' == trim($values['value'], ' ') \|\| 0 === strpos(ltrim($values['value'], ' '), '#')) {`
	`236`	`+ } elseif (!isset($values['value']) \|\| '' == trim($values['value'], ' ') \|\| 0 === strpos(ltrim($values['value'], ' '), '#') \|\| '<<' === $key) {`
`237`	`237`	`// hash`
`238`	`238`	`// if next line is less indented or equal, then it means that the current value is null`
`239`	`239`	`if (!$this->isNextLineIndented() && !$this->isNextLineUnIndentedCollection()) {`
`@@ -244,9 +244,13 @@ private function doParse($value, $exceptionOnInvalidType = false, $objectSupport`
`244`	`244`	`}`
`245`	`245`	`} else {`
`246`	`246`	`$value = $this->parseBlock($this->getRealCurrentLineNb() + 1, $this->getNextEmbedBlock(), $exceptionOnInvalidType, $objectSupport, $objectForMap);`
`247`		`- // Spec: Keys MUST be unique; first one wins.`
`248`		`- // But overwriting is allowed when a merge node is used in current block.`
`249`		`- if ($allowOverwrite \|\| !isset($data[$key])) {`
	`247`	`+`
	`248`	`+ if ('<<' === $key) {`
	`249`	`+ $this->refs[$refMatches['ref']] = $value;`
	`250`	`+ $data += $value;`
	`251`	`+ } elseif ($allowOverwrite \|\| !isset($data[$key])) {`
	`252`	`+ // Spec: Keys MUST be unique; first one wins.`
	`253`	`+ // But overwriting is allowed when a merge node is used in current block.`
`250`	`254`	`$data[$key] = $value;`
`251`	`255`	`}`
`252`	`256`	`}`