raise a parse error for duplicate keys

xabbuh · xabbuh · commit 66bb94af117f · 2025-06-20T15:00:55.000+02:00
diff --git a/UPGRADE-8.0.md b/UPGRADE-8.0.md
@@ -307,3 +307,8 @@ VarExporter
  * Restrict `ProxyHelper::generateLazyProxy()` to generating abstraction-based lazy decorators; use native lazy proxies otherwise
  * Remove `LazyGhostTrait` and `LazyProxyTrait`, use native lazy objects instead
  * Remove `ProxyHelper::generateLazyGhost()`, use native lazy objects instead
+
+Yaml
+----
+
+ * Remove support for parsing duplicate mapping keys whose value is `null`
diff --git a/src/Symfony/Component/Yaml/CHANGELOG.md b/src/Symfony/Component/Yaml/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+8.0
+---
+
+ * Remove support for parsing duplicate mapping keys whose value is `null`
+
 7.3
 ---
 
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -301,7 +301,7 @@ private function doParse(string $value, int $flags): mixed
                         // 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)) {
-                                trigger_deprecation('symfony/yaml', '7.2', 'Duplicate key "%s" detected on line %d whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated and will throw a ParseException in 8.0.', $key, $this->getRealCurrentLineNb() + 1);
+                                throw new ParseException(\sprintf('Duplicate key "%s" detected.', $key), $this->getRealCurrentLineNb() + 1, $this->currentLine);
                             }
 
                             if (null !== $subTag) {
@@ -326,7 +326,7 @@ private function doParse(string $value, int $flags): mixed
                             $data += $value;
                         } elseif ($allowOverwrite || !isset($data[$key])) {
                             if (!$allowOverwrite && \array_key_exists($key, $data)) {
-                                trigger_deprecation('symfony/yaml', '7.2', 'Duplicate key "%s" detected on line %d whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated and will throw a ParseException in 8.0.', $key, $this->getRealCurrentLineNb() + 1);
+                                throw new ParseException(\sprintf('Duplicate key "%s" detected.', $key), $this->getRealCurrentLineNb() + 1, $this->currentLine);
                             }
 
                             // Spec: Keys MUST be unique; first one wins.
@@ -346,7 +346,7 @@ private function doParse(string $value, int $flags): mixed
                     // 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)) {
-                            trigger_deprecation('symfony/yaml', '7.2', 'Duplicate key "%s" detected on line %d whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated and will throw a ParseException in 8.0.', $key, $this->getRealCurrentLineNb() + 1);
+                            throw new ParseException(\sprintf('Duplicate key "%s" detected.', $key), $this->getRealCurrentLineNb() + 1, $this->currentLine);
                         }
 
                         $data[$key] = $value;
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -20,8 +20,6 @@
 
 class ParserTest extends TestCase
 {
-    use ExpectUserDeprecationMessageTrait;
-
     private ?Parser $parser;
 
     protected function setUp(): void
@@ -1059,12 +1057,9 @@ public static function getParseExceptionOnDuplicateData()
         return $tests;
     }
 
-    /**
-     * @group legacy
-     */
     public function testNullAsDuplicatedData()
     {
-        $this->expectUserDeprecationMessage('Since symfony/yaml 7.2: Duplicate key "child" detected on line 4 whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated and will throw a ParseException in 8.0.');
+        $this->expectException(ParseException::class);
 
         $yaml = <<<EOD
 parent:
diff --git a/src/Symfony/Component/Yaml/composer.json b/src/Symfony/Component/Yaml/composer.json
@@ -17,7 +17,6 @@
     ],
     "require": {
         "php": ">=8.4",
-        "symfony/deprecation-contracts": "^2.5|^3.0",
         "symfony/polyfill-ctype": "^1.8"
     },
     "require-dev": {

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@`
`20`	`20`
`21`	`21`	`class ParserTest extends TestCase`
`22`	`22`	`{`
`23`		`- use ExpectUserDeprecationMessageTrait;`
`24`		`-`
`25`	`23`	`private ?Parser $parser;`
`26`	`24`
`27`	`25`	`protected function setUp(): void`
`@@ -1059,12 +1057,9 @@ public static function getParseExceptionOnDuplicateData()`
`1059`	`1057`	`return $tests;`
`1060`	`1058`	`}`
`1061`	`1059`
`1062`		`- /**`
`1063`		`- * @group legacy`
`1064`		`- */`
`1065`	`1060`	`public function testNullAsDuplicatedData()`
`1066`	`1061`	`{`
`1067`		`- $this->expectUserDeprecationMessage('Since symfony/yaml 7.2: Duplicate key "child" detected on line 4 whilst parsing YAML. Silent handling of duplicate mapping keys in YAML is deprecated and will throw a ParseException in 8.0.');`
	`1062`	`+ $this->expectException(ParseException::class);`
`1068`	`1063`
`1069`	`1064`	`$yaml = <<<EOD`
`1070`	`1065`	`parent:`