[Yaml] Throw on duplicate key even when value is NULL

fabpot · Jun 2, 2024 · f9df19b · f9df19b
1 parent 02d5fce
commit f9df19b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/src/Symfony/Component/Yaml/CHANGELOG.md b/src/Symfony/Component/Yaml/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.2
+---
+
+ * duplicate mapping keys throw a `ParseException` even when such key has a NULL value
+
 7.1
 ---
 

diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -299,7 +299,7 @@ private function doParse(string $value, int $flags): mixed
                     if (!$this->isNextLineIndented() && !$this->isNextLineUnIndentedCollection()) {
                         // 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 ($allowOverwrite || !\array_key_exists($key, $data)) {
                             if (null !== $subTag) {
                                 $data[$key] = new TaggedValue($subTag, '');
                             } else {
@@ -320,7 +320,7 @@ private function doParse(string $value, int $flags): mixed
                             }
 
                             $data += $value;
-                        } elseif ($allowOverwrite || !isset($data[$key])) {
+                        } elseif ($allowOverwrite || !\array_key_exists($key, $data)) {
                             // Spec: Keys MUST be unique; first one wins.
                             // But overwriting is allowed when a merge node is used in current block.
                             if (null !== $subTag) {
@@ -336,7 +336,7 @@ private function doParse(string $value, int $flags): mixed
                     $value = $this->parseValue(rtrim($values['value']), $flags, $context);
                     // 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 ($allowOverwrite || !\array_key_exists($key, $data)) {
                         $data[$key] = $value;
                     } else {
                         throw new ParseException(sprintf('Duplicate key "%s" detected.', $key), $this->getRealCurrentLineNb() + 1, $this->currentLine);

diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -1026,6 +1026,14 @@ public static function getParseExceptionOnDuplicateData()
 EOD;
         $tests[] = [$yaml, 'child_sequence', 6];
 
+        $yaml = <<<EOD
+parent:
+  child:
+  child2:
+  child:
+EOD;
+        $tests[] = [$yaml, 'child', 4];
+
         return $tests;
     }