From f95a4d4059fc29390bab183e10b949679c45da70 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sat, 26 Jul 2025 15:47:42 +0200 Subject: [PATCH] resolve conflict --- .../Config/Builder/ConfigBuilderGenerator.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php b/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php index 0ae8b8623605..cfd2810f7681 100644 --- 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"; pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy