Apply suggestions from code review

bobvandevijver · nicolas-grekas · web-flow · commit d361dc76d65b · 2025-06-27T17:44:18.000+02:00
Co-authored-by: Nicolas Grekas &lt;nicolas.grekas@gmail.com&gt;
diff --git a/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php b/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php
@@ -132,7 +132,7 @@ private function handleArrayNode(ArrayNode $node, ClassBuilder $class, string $n
 
         $hasNormalizationClosures = $this->hasNormalizationClosures($node);
         $comment = $this->getComment($node);
-        if ($hasNormalizationClosures && $paramType !== 'array') {
+        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());
@@ -145,7 +145,7 @@ private function handleArrayNode(ArrayNode $node, ClassBuilder $class, string $n
             $node->getName(),
             $this->getType($childClass->getFqcn(), $hasNormalizationClosures)
         );
-        $body = $hasNormalizationClosures && $paramType !== 'array' ? '
+        $body = $hasNormalizationClosures && 'array' !== $paramType ? '
 COMMENTpublic function NAME(PARAM_TYPE $value = []): CLASS|static
 {
     if (!\is_array($value)) {
@@ -286,7 +286,7 @@ public function NAME(string $VAR, TYPE $VALUE): static
         $paramType = $this->getParamType($noKey ? $nodeParameterTypes : $prototypeParameterTypes);
 
         $comment = $this->getComment($node);
-        if ($hasNormalizationClosures && $paramType !== 'array') {
+        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());
@@ -296,7 +296,7 @@ public function NAME(string $VAR, TYPE $VALUE): static
         }
 
         if ($noKey) {
-            $body = $hasNormalizationClosures && $paramType !== 'array' ? '
+            $body = $hasNormalizationClosures && 'array' !== $paramType ? '
 COMMENTpublic function NAME(PARAM_TYPE $value = []): CLASS|static
 {
     $this->_usedProperties[\'PROPERTY\'] = true;
@@ -321,7 +321,7 @@ public function NAME(string $VAR, TYPE $VALUE): static
                 'PARAM_TYPE' => $paramType,
             ]);
         } else {
-            $body = $hasNormalizationClosures && $paramType !== 'array' ? '
+            $body = $hasNormalizationClosures && 'array' !== $paramType ? '
 COMMENTpublic function NAME(string $VAR, PARAM_TYPE $VALUE = []): CLASS|static
 {
     if (!\is_array($VALUE)) {
diff --git a/src/Symfony/Component/Config/Tests/Builder/Fixtures/ArrayValues/Symfony/Config/ArrayValues/ErrorPagesConfig.php b/src/Symfony/Component/Config/Tests/Builder/Fixtures/ArrayValues/Symfony/Config/ArrayValues/ErrorPagesConfig.php
@@ -54,7 +54,7 @@ public function __construct(array $value = [])
             unset($value['with_trace']);
         }
 
-        if ([] !== $value) {
+        if ($value) {
             throw new InvalidConfigurationException(sprintf('The following keys are not supported by "%s": ', __CLASS__).implode(', ', array_keys($value)));
         }
     }
diff --git a/src/Symfony/Component/Config/Tests/Builder/Fixtures/ArrayValues/Symfony/Config/ArrayValues/TransportsConfig.php b/src/Symfony/Component/Config/Tests/Builder/Fixtures/ArrayValues/Symfony/Config/ArrayValues/TransportsConfig.php
@@ -34,7 +34,7 @@ public function __construct(array $value = [])
             unset($value['dsn']);
         }
 
-        if ([] !== $value) {
+        if ($value) {
             throw new InvalidConfigurationException(sprintf('The following keys are not supported by "%s": ', __CLASS__).implode(', ', array_keys($value)));
         }
     }
diff --git a/src/Symfony/Component/Config/Tests/Builder/Fixtures/ArrayValues/Symfony/Config/ArrayValuesConfig.php b/src/Symfony/Component/Config/Tests/Builder/Fixtures/ArrayValues/Symfony/Config/ArrayValuesConfig.php
@@ -75,7 +75,7 @@ public function __construct(array $value = [])
             unset($value['error_pages']);
         }
 
-        if ([] !== $value) {
+        if ($value) {
             throw new InvalidConfigurationException(sprintf('The following keys are not supported by "%s": ', __CLASS__).implode(', ', array_keys($value)));
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function __construct(array $value = [])`
`54`	`54`	`unset($value['with_trace']);`
`55`	`55`	`}`
`56`	`56`
`57`		`- if ([] !== $value) {`
	`57`	`+ if ($value) {`
`58`	`58`	`throw new InvalidConfigurationException(sprintf('The following keys are not supported by "%s": ', __CLASS__).implode(', ', array_keys($value)));`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function __construct(array $value = [])`
`34`	`34`	`unset($value['dsn']);`
`35`	`35`	`}`
`36`	`36`
`37`		`- if ([] !== $value) {`
	`37`	`+ if ($value) {`
`38`	`38`	`throw new InvalidConfigurationException(sprintf('The following keys are not supported by "%s": ', __CLASS__).implode(', ', array_keys($value)));`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function __construct(array $value = [])`
`75`	`75`	`unset($value['error_pages']);`
`76`	`76`	`}`
`77`	`77`
`78`		`- if ([] !== $value) {`
	`78`	`+ if ($value) {`
`79`	`79`	`throw new InvalidConfigurationException(sprintf('The following keys are not supported by "%s": ', __CLASS__).implode(', ', array_keys($value)));`
`80`	`80`	`}`
`81`	`81`	`}`