[Config] Fix ArrayShapeGenerator required keys with deep merging

Author: lacatoire

Definition/ArrayNode.php

@@ -126,6 +126,14 @@ public function setPerformDeepMerging(bool $boolean): void
         $this->performDeepMerging = $boolean;
     }
 
+    /**
+     * Whether deep merging should occur.
+     */
+    public function shouldPerformDeepMerging(): bool
+    {
+        return $this->performDeepMerging;
+    }
+
     /**
      * Whether extra keys should just be ignored without an exception.
      *

Definition/ArrayShapeGenerator.php

@@ -60,7 +60,7 @@ private static function doGeneratePhpDoc(NodeInterface $node, int $nestingLevel
         $arrayShape = \sprintf("array{%s\n", self::generateInlinePhpDocForNode($node));
 
         foreach ($children as $child) {
-            $arrayShape .= str_repeat('    ', $nestingLevel).self::dumpNodeKey($child).': ';
+            $arrayShape .= str_repeat('    ', $nestingLevel).self::dumpNodeKey($child, $node).': ';
 
             if ($child instanceof PrototypedArrayNode) {
                 $isHashmap = (bool) $child->getKeyAttribute();
@@ -82,7 +82,7 @@ private static function doGeneratePhpDoc(NodeInterface $node, int $nestingLevel
         return implode('|', [...self::getNormalizedTypes($node, ['array', 'any']), $arrayShape]);
     }
 
-    private static function dumpNodeKey(NodeInterface $node): string
+    private static function dumpNodeKey(NodeInterface $node, ?ArrayNode $parent = null): string
     {
         $name = $node->getName();
         $quoted = str_starts_with($name, '@')
@@ -93,7 +93,9 @@ private static function dumpNodeKey(NodeInterface $node): string
             $name = "'".addslashes($name)."'";
         }
 
-        return $name.($node->isRequired() ? '' : '?');
+        $optional = !$node->isRequired() || ($parent instanceof ArrayNode && $parent->shouldPerformDeepMerging());
+
+        return $name.($optional ? '?' : '');
     }
 
     private static function handleNumericNode(NumericNode $node): string

Tests/Definition/ArrayShapeGeneratorTest.php

@@ -105,6 +105,18 @@ public function testPhpDocHandlesRequiredNode()
         $root = new ArrayNode('root');
         $root->addChild($child);
 
+        $this->assertStringContainsString('node?: bool', ArrayShapeGenerator::generate($root));
+    }
+
+    public function testPhpDocHandlesRequiredNodeWithNoDeepMerging()
+    {
+        $child = new BooleanNode('node');
+        $child->setRequired(true);
+
+        $root = new ArrayNode('root');
+        $root->setPerformDeepMerging(false);
+        $root->addChild($child);
+
         $expected = 'node: bool';
 
         $this->assertStringContainsString($expected, ArrayShapeGenerator::generate($root));