Fix prepending strategy for php config loader

yceruto · yceruto · commit 83284daecb08 · 2024-05-17T11:52:00.000-04:00
diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
@@ -146,7 +146,7 @@ class_exists(ContainerConfigurator::class);
         $callback(...$arguments);
 
         foreach ($configBuilders as $configBuilder) {
-            $containerConfigurator->extension($configBuilder->getExtensionAlias(), $configBuilder->toArray(), $this->prepend);
+            $this->loadExtensionConfig($configBuilder->getExtensionAlias(), ContainerConfigurator::processValue($configBuilder->toArray()));
         }
 
         $this->loadExtensionConfigs();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/config_builder.expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/config_builder.expected.yml
@@ -1,5 +1,5 @@
 parameters:
-    acme.configs: [{ color: blue }]
+    acme.configs: [{ color: red }, { color: blue }]
 
 services:
     service_container:
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/config_builder.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/config_builder.php
@@ -1,11 +1,14 @@
 <?php
 
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\AcmeConfig;
 
 if ('prod' !== $env) {
     return;
 }
 
-return function (AcmeConfig $config) {
+return function (AcmeConfig $config, ContainerConfigurator $c) {
     $config->color('blue');
+
+    $c->import('nested_config_builder.php');
 };
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/nested_config_builder.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/nested_config_builder.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Tests\Fixtures\AcmeConfig;
+
+if ('prod' !== $env) {
+    return;
+}
+
+return function (AcmeConfig $config) {
+    $config->color('red');
+};
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
@@ -56,6 +56,7 @@ public function testPrependExtensionConfig()
         $loader->load('config/config_builder.php');
 
         $expected = [
+            ['color' => 'red'],
             ['color' => 'blue'],
             ['foo' => 'bar'],
         ];

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ class_exists(ContainerConfigurator::class);`
`146`	`146`	`$callback(...$arguments);`
`147`	`147`
`148`	`148`	`foreach ($configBuilders as $configBuilder) {`
`149`		`- $containerConfigurator->extension($configBuilder->getExtensionAlias(), $configBuilder->toArray(), $this->prepend);`
	`149`	`+ $this->loadExtensionConfig($configBuilder->getExtensionAlias(), ContainerConfigurator::processValue($configBuilder->toArray()));`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`$this->loadExtensionConfigs();`