[DependencyInjection] Allow using enums in container configurator

ludekbenedik · ludekbenedik · commit 782d894f1315 · 2023-05-15T20:47:51.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php
@@ -101,6 +101,7 @@ public static function processValue($value, $allowServices = false)
         switch (true) {
             case null === $value:
             case \is_scalar($value):
+            case $value instanceof \UnitEnum:
                 return $value;
 
             case $value instanceof ArgumentInterface:
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services_with_enumeration.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services_with_enumeration.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\FooClassWithEnumAttribute;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum;
+
+return function (ContainerConfigurator $container) {
+    $container->parameters()
+        ->set('unit_enum', FooUnitEnum::BAR)
+        ->set('enum_array', [FooUnitEnum::BAR, FooUnitEnum::FOO]);
+
+    $services = $container->services();
+
+    $services->defaults()->public();
+
+    $services->set('service_container', ContainerInterface::class)
+        ->synthetic();
+
+    $services->set(FooClassWithEnumAttribute::class)
+        ->args([FooUnitEnum::BAR]);
+};
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
@@ -22,6 +22,8 @@
 use Symfony\Component\DependencyInjection\Dumper\YamlDumper;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\FooClassWithEnumAttribute;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum;
 
 class PhpFileLoaderTest extends TestCase
 {
@@ -165,6 +167,19 @@ public function testEnvConfigurator()
         $this->assertSame('%env(int:CCC)%', $container->getDefinition('foo')->getArgument(0));
     }
 
+    public function testEnumeration()
+    {
+        $fixtures = realpath(__DIR__.'/../Fixtures');
+        $container = new ContainerBuilder();
+        $loader = new PhpFileLoader($container, new FileLocator($fixtures.'/config'));
+        $loader->load('services_with_enumeration.php');
+
+        $container->compile();
+
+        $definition = $container->getDefinition(FooClassWithEnumAttribute::class);
+        $this->assertSame([FooUnitEnum::BAR], $definition->getArguments());
+    }
+
     /**
      * @group legacy
      */
