bug #54977 [DependencyInjection] Fix prepending strategy for php config loader (yceruto)

This PR was merged into the 7.1 branch.

Discussion
----------

[DependencyInjection] Fix prepending strategy for php config loader

| Q             | A
| ------------- | ---
| Branch?       | 7.1
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Issues        | Fix #54852
| License       | MIT

working towards fixing symfony/symfony#54970

Commits
-------

a7ecb8568d Fix prepending strategy for php config loader

Author: fabpot

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();

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:

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) {
+    $c->import('nested_config_builder.php');
+
     $config->color('blue');
 };

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');
+};

Tests/Loader/PhpFileLoaderTest.php

@@ -56,6 +56,7 @@ public function testPrependExtensionConfig()
         $loader->load('config/config_builder.php');
 
         $expected = [
+            ['color' => 'red'],
             ['color' => 'blue'],
             ['foo' => 'bar'],
         ];