[DependencyInjection] Fix env default processor with scalar node

tBibaut · tBibaut · commit 72564bcfd100 · 2024-12-19T14:46:32.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php
@@ -51,12 +51,22 @@ public function process(ContainerBuilder $container)
         foreach ($resolvingBag->getEnvPlaceholders() + $resolvingBag->getUnusedEnvPlaceholders() as $env => $placeholders) {
             $values = [];
             if (false === $i = strpos($env, ':')) {
-                $default = $defaultBag->has("env($env)") ? $defaultBag->get("env($env)") : self::TYPE_FIXTURES['string'];
-                $defaultType = null !== $default ? get_debug_type($default) : 'string';
+                [$default, $defaultType] = $this->getParameterDefaultAndDefaultType("env($env)", $defaultBag);
                 $values[$defaultType] = $default;
             } else {
                 $prefix = substr($env, 0, $i);
-                foreach ($envTypes[$prefix] ?? ['string'] as $type) {
+
+                if ('default' === $prefix) {
+                    [$parameter, $envVar] = explode(':', substr($env, $i + 1));
+                    [$defaultParameter, $defaultParameterType] = $this->getParameterDefaultAndDefaultType($parameter, $defaultBag);
+                    [$defaultEnv, $defaultEnvType] = $this->getParameterDefaultAndDefaultType("env($envVar)", $defaultBag);
+
+                    $types = array_unique([$defaultParameterType, $defaultEnvType]);
+                } else {
+                    $types = $envTypes[$prefix] ?? ['string'];
+                }
+
+                foreach ($types as $type) {
                     $values[$type] = self::TYPE_FIXTURES[$type] ?? null;
                 }
             }
@@ -100,4 +110,15 @@ public function getExtensionConfig(): array
             $this->extensionConfig = [];
         }
     }
+
+    /**
+     * @return array{0: string, 1: string}
+     */
+    private function getParameterDefaultAndDefaultType(string $name, ParameterBag $defaultBag): array
+    {
+        $default = $defaultBag->has($name) ? $defaultBag->get($name) : self::TYPE_FIXTURES['string'];
+        $defaultType = null !== $default ? get_debug_type($default) : 'string';
+
+        return [$default, $defaultType];
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php
@@ -73,6 +73,20 @@ public function testDefaultEnvWithoutPrefixIsValidatedInConfig()
         $this->doProcess($container);
     }
 
+    public function testDefaultProcessorWithScalarNode()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('parameter_int', 12134);
+        $container->setParameter('env(FLOATISH)', 4.2);
+        $container->registerExtension($ext = new EnvExtension());
+        $container->prependExtensionConfig('env_extension', $expected = [
+            'scalar_node' => '%env(default:parameter_int:FLOATISH)%',
+        ]);
+
+        $this->doProcess($container);
+        $this->assertSame($expected, $container->resolveEnvPlaceholders($ext->getConfig()));
+    }
+
     public function testEnvsAreValidatedInConfigWithInvalidPlaceholder()
     {
         $this->expectException(InvalidTypeException::class);
