Add bool env processor when not defined

ruudk · ruudk · commit 21386a23822b · 2024-02-16T15:13:34.000+01:00
Fixes #53918
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -8,6 +8,7 @@ CHANGELOG
  * Add argument `$prepend` to `ContainerConfigurator::extension()` to prepend the configuration instead of appending it
  * Have `ServiceLocator` implement `ServiceCollectionInterface`
  * Add `#[Lazy]` attribute as shortcut for `#[Autowire(lazy: [bool|string])]` and `#[Autoconfigure(lazy: [bool|string])]`
+ * Add bool env var processor when needed
 
 7.0
 ---
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection\Compiler;
 
+use ReflectionNamedType;
 use Symfony\Component\Config\Resource\ClassExistenceResource;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\DependencyInjection\Attribute\AutowireCallable;
@@ -308,6 +309,11 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
 
                 foreach ($attributes as $attribute) {
                     $attribute = $attribute->newInstance();
+
+                    if ($parameter->getType() instanceof ReflectionNamedType && $parameter->getType()->getName() === 'bool' && preg_match('/^%env\((?<name>\w+)\)%$/', $attribute->value, $matches) === 1) {
+                        $attribute = new Autowire(env: 'bool:' . $matches['name']);
+                    }
+
                     $invalidBehavior = $parameter->allowsNull() ? ContainerInterface::NULL_ON_INVALID_REFERENCE : ContainerBuilder::EXCEPTION_ON_INVALID_REFERENCE;
 
                     try {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -1393,4 +1393,17 @@ public function testLazyNotCompatibleWithAutowire()
             $this->assertSame('Using both attributes #[Lazy] and #[Autowire] on an argument is not allowed; use the "lazy" parameter of #[Autowire] instead.', $e->getMessage());
         }
     }
+
+    public function testAutowireAttributeBoolParameterWithoutBoolEnvProcessor()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo', AutowireAttributeEnvBool::class)->setAutowired(true);
+
+        (new AutowirePass())->process($container);
+
+        $definition = $container->getDefinition('foo');
+
+        $this->assertSame('%env(bool:ENABLED)%', $container->resolveEnvPlaceholders($definition->getArguments()[0]));
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php
@@ -81,6 +81,15 @@ public function __construct(
     }
 }
 
+class AutowireAttributeEnvBool
+{
+    public function __construct(
+        #[Autowire(env: 'ENABLED')]
+        public bool $enabled,
+    ) {
+    }
+}
+
 interface AsDecoratorInterface
 {
 }

Original file line number	Diff line number	Diff line change
`@@ -1393,4 +1393,17 @@ public function testLazyNotCompatibleWithAutowire()`
`1393`	`1393`	`$this->assertSame('Using both attributes #[Lazy] and #[Autowire] on an argument is not allowed; use the "lazy" parameter of #[Autowire] instead.', $e->getMessage());`
`1394`	`1394`	`}`
`1395`	`1395`	`}`
	`1396`	`+`
	`1397`	`+ public function testAutowireAttributeBoolParameterWithoutBoolEnvProcessor()`
	`1398`	`+ {`
	`1399`	`+ $container = new ContainerBuilder();`
	`1400`	`+`
	`1401`	`+ $container->register('foo', AutowireAttributeEnvBool::class)->setAutowired(true);`
	`1402`	`+`
	`1403`	`+ (new AutowirePass())->process($container);`
	`1404`	`+`
	`1405`	`+ $definition = $container->getDefinition('foo');`
	`1406`	`+`
	`1407`	`+ $this->assertSame('%env(bool:ENABLED)%', $container->resolveEnvPlaceholders($definition->getArguments()[0]));`
	`1408`	`+ }`
`1396`	`1409`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,15 @@ public function __construct(`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
	`84`	`+class AutowireAttributeEnvBool`
	`85`	`+{`
	`86`	`+ public function __construct(`
	`87`	`+ #[Autowire(env: 'ENABLED')]`
	`88`	`+ public bool $enabled,`
	`89`	`+ ) {`
	`90`	`+ }`
	`91`	`+}`
	`92`	`+`
`84`	`93`	`interface AsDecoratorInterface`
`85`	`94`	`{`
`86`	`95`	`}`