Commite6dc6be

committed

[DependencyInjection] Process PHP configs using the ContainerConfigurator

1 parentc58c599 commite6dc6beCopy full SHA for e6dc6be

File tree

+19

-9

lines changed

+19

-9

lines changed

Lines changed: 1 addition & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -145,16 +145,8 @@ class_exists(ContainerConfigurator::class);`
`145`	`145`
`146`	`146`	`$callback(...$arguments);`
`147`	`147`
`148`		`-$this->loadFromExtensions($configBuilders);`
`149`		`- }`
`150`		`-`
`151`		`-/**`
`152`		`- * @param iterable<ConfigBuilderInterface> $configBuilders`
`153`		`- */`
`154`		`-privatefunctionloadFromExtensions(iterable$configBuilders):void`
`155`		`- {`
`156`	`148`	`foreach ($configBuildersas$configBuilder) {`
`157`		`-$this->loadExtensionConfig($configBuilder->getExtensionAlias(),$configBuilder->toArray());`
	`149`	`+$containerConfigurator->extension($configBuilder->getExtensionAlias(),$configBuilder->toArray(),$this->prepend);`
`158`	`150`	`}`
`159`	`151`
`160`	`152`	`$this->loadExtensionConfigs();`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,8 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+useSymfony\Component\DependencyInjection\Tests\Fixtures\AcmeConfig;`
	`4`	`+usefunctionSymfony\Component\DependencyInjection\Loader\Configurator\env;`
	`5`	`+`
	`6`	`+returnfunction (AcmeConfig$config) {`
	`7`	`+$config->color(env('COLOR'));`
	`8`	`+};`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -243,4 +243,14 @@ public function testServiceWithServiceLocatorArgument()`
`243`	`243`	`$values = ['foo' =>newDefinition(\stdClass::class),'bar' =>newDefinition(\stdClass::class)];`
`244`	`244`	`$this->assertEquals([newServiceLocatorArgument($values)],$container->getDefinition('locator_dependent_inline_service')->getArguments());`
`245`	`245`	`}`
	`246`	`+`
	`247`	`+publicfunctiontestConfigBuilderEnvConfigurator()`
	`248`	`+ {`
	`249`	`+$container =newContainerBuilder();`
	`250`	`+$container->registerExtension(new \AcmeExtension());`
	`251`	`+$loader =newPhpFileLoader($container,newFileLocator(\dirname(__DIR__).'/Fixtures'),'prod',newConfigBuilderGenerator(sys_get_temp_dir()),true);`
	`252`	`+$loader->load('config/config_builder_env_configurator.php');`
	`253`	`+`
	`254`	`+$this->assertIsString($container->getExtensionConfig('acme')[0]['color']);`
	`255`	`+ }`
`246`	`256`	`}`

Comments

(0)