From e6dc6be2c05a59f673e1ffbcd2803d1e74c849c0 Mon Sep 17 00:00:00 2001 From: MatTheCat Date: Fri, 17 May 2024 14:19:57 +0200 Subject: [PATCH] [DependencyInjection] Process PHP configs using the ContainerConfigurator --- .../DependencyInjection/Loader/PhpFileLoader.php | 10 +--------- .../config/config_builder_env_configurator.php | 8 ++++++++ .../Tests/Loader/PhpFileLoaderTest.php | 10 ++++++++++ 3 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/config_builder_env_configurator.php diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php index c3c6e5735d2b2..35173cf3a031e 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 0000000000000..62c9453448520 --- /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 39426d6b691d0..d3721286cd12a 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