symfony
diff --git a/‎src/Symfony/Component/Yaml/Parser.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Yaml/Parser.php
+3-3Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Component/Yaml/Parser.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Yaml/Parser.php
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Yaml/Tests/Fixtures/sfMergeKey.yml
Copy file name to clipboardExpand all lines: src/Symfony/Component/Yaml/Tests/Fixtures/sfMergeKey.yml
+6-4Lines changed: 6 additions & 4 deletions b/‎src/Symfony/Component/Yaml/Tests/Fixtures/sfMergeKey.yml
Copy file name to clipboardExpand all lines: src/Symfony/Component/Yaml/Tests/Fixtures/sfMergeKey.yml
+6-4Lines changed: 6 additions & 4 deletions
@@ -161,7 +161,7 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
                             throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
                         }
 
-                        $data += $refValue;
+                        $data += $refValue; // array union
                     } else {
                         if (isset($values['value']) && $values['value'] !== '') {
                             $value = $values['value'];
@@ -183,12 +183,12 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =
                                     throw new ParseException('Merge items must be arrays.', $this->getRealCurrentLineNb() + 1, $parsedItem);
                                 }
 
-                                $data += $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;
+                            $data += $parsed; // array union
                         }
                     }
                 } elseif (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
 
@@ -10,9 +10,11 @@ yaml: |
         a: Steve
         b: Clark
         c: Brian
+        e: notnull
     bar:
         a: before
         d: other
+        e: ~
         <<: *foo
         b: new
         x: Oren
@@ -46,13 +48,13 @@ yaml: |
             <<: *nestedref
 php: |
     array(
-        'foo' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian'),
-        'bar' => array('a' => 'before', 'd' => 'other', 'b' => 'new', 'c' => array('foo' => 'bar', 'bar' => 'foo'), 'x' => 'Oren'),
+        'foo' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'e' => 'notnull'),
+        'bar' => array('a' => 'before', 'd' => 'other', 'e' => null, 'b' => 'new', 'c' => array('foo' => 'bar', 'bar' => 'foo'), 'x' => 'Oren'),
         'duplicate' => array('foo' => 'bar'),
         'foo2' => array('a' => 'Ballmer'),
         'ding' => array('fi', 'fei', 'fo', 'fam'),
-        'check' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'fi', 'fei', 'fo', 'fam', 'isit' => 'tested'),
-        'head' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'fi', 'fei', 'fo', 'fam'),
+        'check' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'e' => 'notnull', 'fi', 'fei', 'fo', 'fam', 'isit' => 'tested'),
+        'head' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'e' => 'notnull', 'fi', 'fei', 'fo', 'fam'),
         'taz' => array('a' => 'Steve', 'w' => array('p' => 1234)),
         'nested' => array('a' => 'Steve', 'w' => array('p' => 12345), 'd' => 'Doug', 'z' => array('p' => 12345))
     )
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =`
`161`	`161`	`throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine);`
`162`	`162`	`}`
`163`	`163`
`164`		`- $data += $refValue;`
	`164`	`+ $data += $refValue; // array union`
`165`	`165`	`} else {`
`166`	`166`	`if (isset($values['value']) && $values['value'] !== '') {`
`167`	`167`	`$value = $values['value'];`
`@@ -183,12 +183,12 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport =`
`183`	`183`	`throw new ParseException('Merge items must be arrays.', $this->getRealCurrentLineNb() + 1, $parsedItem);`
`184`	`184`	`}`
`185`	`185`
`186`		`- $data += $parsedItem;`
	`186`	`+ $data += $parsedItem; // array union`
`187`	`187`	`}`
`188`	`188`	`} else {`
`189`	`189`	`// If the value associated with the key is a single mapping node, each of its key/value pairs is inserted into the`
`190`	`190`	`// current mapping, unless the key already exists in it.`
`191`		`- $data += $parsed;`
	`191`	`+ $data += $parsed; // array union`
`192`	`192`	`}`
`193`	`193`	`}`
`194`	`194`	`} elseif (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) (?P<value>.)#u', $values['value'], $matches)) {`