diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php index c3c6e5735d2b..35173cf3a031 100644 --- 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 $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 new file mode 100644 index 000000000000..62c945344852 --- /dev/null +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/config_builder_env_configurator.php @@ -0,0 +1,8 @@ +color(env('COLOR')); +}; diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php index 39426d6b691d..d3721286cd12 100644 --- 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']); + } } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy