fix routing config type information

xabbuh · xabbuh · commit d0959c6c1d5a · 2025-11-17T10:02:52.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/PhpConfigReferenceDumpPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/PhpConfigReferenceDumpPass.php
@@ -69,17 +69,10 @@ public static function config(array $config): array
 
     private const ROUTES_TYPES_TEMPLATE = <<<'PHPDOC'
 
-         * @psalm-type RoutesConfig = array{{SHAPE}
-         *     ...<string, RouteConfig|ImportConfig|AliasConfig>
-         * }
+         * @psalm-type RoutesConfig = array<string, RouteConfig|ImportConfig|AliasConfig|array<string, RouteConfig|ImportConfig|AliasConfig>>
          */
         PHPDOC;
 
-    private const WHEN_ENV_ROUTES_TEMPLATE = <<<'PHPDOC'
-
-         *     "when@{ENV}"?: array<string, RouteConfig|ImportConfig|AliasConfig>,
-        PHPDOC;
-
     public function __construct(
         private string $referenceFile,
         private array $bundlesDefinition,
@@ -145,19 +138,11 @@ public function process(ContainerBuilder $container): void
         if (false === $i = strpos($phpdoc = $r->getDocComment(), "\n * @psalm-type RoutesConfig = ")) {
             throw new \LogicException(\sprintf('Cannot insert config shape in "%s".', RoutesReference::class));
         }
-        $routesTypes = '';
-        foreach ($knownEnvs as $env) {
-            $routesTypes .= strtr(self::WHEN_ENV_ROUTES_TEMPLATE, ['{ENV}' => $env]);
-        }
-        if ('' !== $routesTypes) {
-            $routesTypes = strtr(self::ROUTES_TYPES_TEMPLATE, ['{SHAPE}' => $routesTypes]);
-            $routesTypes = substr_replace($phpdoc, $routesTypes, $i);
-        }
 
         $configReference = strtr(self::REFERENCE_TEMPLATE, [
             '{APP_TYPES}' => $appTypes,
             '{APP_PARAM}' => $appParam,
-            '{ROUTES_TYPES}' => $routesTypes,
+            '{ROUTES_TYPES}' => substr_replace($phpdoc, self::ROUTES_TYPES_TEMPLATE, $i),
             '{ROUTES_PARAM}' => $r->getMethod('config')->getDocComment(),
         ]);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/reference.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/reference.php
@@ -231,12 +231,7 @@ public static function config(array $config): array
  *     alias: string,
  *     deprecated?: array{package:string, version:string, message?:string},
  * }
- * @psalm-type RoutesConfig = array{
- *     "when@dev"?: array<string, RouteConfig|ImportConfig|AliasConfig>,
- *     "when@prod"?: array<string, RouteConfig|ImportConfig|AliasConfig>,
- *     "when@test"?: array<string, RouteConfig|ImportConfig|AliasConfig>,
- *     ...<string, RouteConfig|ImportConfig|AliasConfig>
- * }
+ * @psalm-type RoutesConfig = array<string, RouteConfig|ImportConfig|AliasConfig|array<string, RouteConfig|ImportConfig|AliasConfig>>
  */
 final class Routes extends RoutesReference
 {
