[DependencyInjection] Process PHP configs using the ContainerConfigurator

MatTheCat · MatTheCat · commit e6dc6be2c05a · 2024-05-17T14:19:57.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
@@ -145,16 +145,8 @@ class_exists(ContainerConfigurator::class);
 
         $callback(...$arguments);
 
-        $this->loadFromExtensions($configBuilders);
-    }
-
-    /**
-     * @param iterable<ConfigBuilderInterface> $configBuilders
-     */
-    private function loadFromExtensions(iterable $configBuilders): void
-    {
         foreach ($configBuilders as $configBuilder) {
-            $this->loadExtensionConfig($configBuilder->getExtensionAlias(), $configBuilder->toArray());
+            $containerConfigurator->extension($configBuilder->getExtensionAlias(), $configBuilder->toArray(), $this->prepend);
         }
 
         $this->loadExtensionConfigs();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/config_builder_env_configurator.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/config_builder_env_configurator.php
@@ -0,0 +1,8 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Tests\Fixtures\AcmeConfig;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\env;
+
+return function (AcmeConfig $config) {
+    $config->color(env('COLOR'));
+};
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
@@ -243,4 +243,14 @@ public function testServiceWithServiceLocatorArgument()
         $values = ['foo' => new Definition(\stdClass::class), 'bar' => new Definition(\stdClass::class)];
         $this->assertEquals([new ServiceLocatorArgument($values)], $container->getDefinition('locator_dependent_inline_service')->getArguments());
     }
+
+    public function testConfigBuilderEnvConfigurator()
+    {
+        $container = new ContainerBuilder();
+        $container->registerExtension(new \AcmeExtension());
+        $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Fixtures'), 'prod', new ConfigBuilderGenerator(sys_get_temp_dir()), true);
+        $loader->load('config/config_builder_env_configurator.php');
+
+        $this->assertIsString($container->getExtensionConfig('acme')[0]['color']);
+    }
 }
