minor #61244 [Config] resolve conflict (xabbuh)

xabbuh · xabbuh · commit 47a5a5e25847 · 2025-07-26T15:54:30.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [Config] resolve conflict | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #61243 | License | MIT Commits ------- f95a4d4 resolve conflict
diff --git a/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php b/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php
@@ -286,17 +286,10 @@ public function NAME(string $VAR, TYPE $VALUE): static
         $paramType = $this->getParamType($noKey ? $nodeParameterTypes : $prototypeParameterTypes);
 
         $comment = $this->getComment($node);
-<<<<<<< HEAD
-        if ($hasNormalizationClosures) {
-            $comment = \sprintf(" * @template TValue\n * @param TValue \$value\n%s", $comment);
+        if ($hasNormalizationClosures && 'array' !== $paramType) {
+            $comment = \sprintf(" * @template TValue of %s\n * @param TValue \$value\n%s", $paramType, $comment);
             $comment .= \sprintf(' * @return %s|$this'."\n", $childClass->getFqcn());
             $comment .= \sprintf(' * @psalm-return (TValue is array ? %s : static)'."\n ", $childClass->getFqcn());
-=======
-        if ($hasNormalizationClosures && 'array' !== $paramType) {
-            $comment = sprintf(" * @template TValue of %s\n * @param TValue \$value\n%s", $paramType, $comment);
-            $comment .= sprintf(' * @return %s|$this'."\n", $childClass->getFqcn());
-            $comment .= sprintf(' * @psalm-return (TValue is array ? %s : static)'."\n ", $childClass->getFqcn());
->>>>>>> 100c683018d ([Config] Do not generate unreachable configuration paths)
         }
         if ('' !== $comment) {
             $comment = "/**\n$comment*/\n";
