Merge branch '7.4' into 8.0

* 7.4:
  [DependencyInjection] Fix FC with Config v8
  Use standard MONGODB_URI for test configuration

Author: nicolas-grekas

Loader/PhpFileLoader.php

@@ -40,13 +40,21 @@ class PhpFileLoader extends FileLoader
 {
     protected bool $autoRegisterAliasesForSinglyImplementedInterfaces = false;
 
+    private ?ConfigBuilderGeneratorInterface $generator;
+
     public function __construct(
         ContainerBuilder $container,
         FileLocatorInterface $locator,
         ?string $env = null,
-        private ?ConfigBuilderGeneratorInterface $generator = null,
+        ConfigBuilderGeneratorInterface|bool|null $generator = null,
         bool $prepend = false,
     ) {
+        if (\is_bool($generator)) {
+            $prepend = $generator;
+            $generator = null;
+        }
+        $this->generator = $generator;
+
         parent::__construct($container, $locator, $env, $prepend);
     }
 

Tests/Fixtures/config/config_builder_env_configurator.php renamed to Tests/Fixtures/config/array_env_configurator.php

@@ -59,7 +59,7 @@ public function testPrependExtensionConfigWithLoadMethod()
         $container = new ContainerBuilder();
         $container->registerExtension(new \AcmeExtension());
         $container->prependExtensionConfig('acme', ['foo' => 'bar']);
-        $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Fixtures/config'), 'prod', new ConfigBuilderGenerator(sys_get_temp_dir()), true);
+        $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Fixtures/config'), 'prod', prepend: true);
         $loader->load('config_builder.php');
 
         $expected = [
@@ -75,7 +75,7 @@ public function testPrependExtensionConfigWithImportMethod()
         $container = new ContainerBuilder();
         $container->registerExtension(new \AcmeExtension());
         $container->prependExtensionConfig('acme', ['foo' => 'bar']);
-        $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Fixtures/config'), 'prod', new ConfigBuilderGenerator(sys_get_temp_dir()), true);
+        $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Fixtures/config'), 'prod', prepend: true);
         $loader->import('config_builder.php');
 
         $expected = [
@@ -115,7 +115,7 @@ public function testConfig($file)
         $fixtures = realpath(__DIR__.'/../Fixtures');
         $container = new ContainerBuilder();
         $container->registerExtension(new \AcmeExtension());
-        $loader = new PhpFileLoader($container, new FileLocator(), 'prod', new ConfigBuilderGenerator(sys_get_temp_dir()));
+        $loader = new PhpFileLoader($container, new FileLocator(), 'prod');
         $loader->load($fixtures.'/config/'.$file.'.php');
 
         $container->compile();
@@ -262,7 +262,7 @@ public function testWhenEnv()
 
         $fixtures = realpath(__DIR__.'/../Fixtures');
         $container = new ContainerBuilder();
-        $loader = new PhpFileLoader($container, new FileLocator(), 'dev', new ConfigBuilderGenerator(sys_get_temp_dir()));
+        $loader = new PhpFileLoader($container, new FileLocator(), 'dev');
 
         $loader->load($fixtures.'/config/when_env.php');
     }
@@ -273,7 +273,7 @@ public function testNotWhenEnv()
 
         $fixtures = realpath(__DIR__.'/../Fixtures');
         $container = new ContainerBuilder();
-        $loader = new PhpFileLoader($container, new FileLocator(), 'prod', new ConfigBuilderGenerator(sys_get_temp_dir()));
+        $loader = new PhpFileLoader($container, new FileLocator(), 'prod');
 
         $loader->load($fixtures.'/config/not_when_env.php');
     }
@@ -282,7 +282,7 @@ public function testUsingBothWhenAndNotWhenEnv()
     {
         $fixtures = realpath(__DIR__.'/../Fixtures');
         $container = new ContainerBuilder();
-        $loader = new PhpFileLoader($container, new FileLocator(), 'prod', new ConfigBuilderGenerator(sys_get_temp_dir()));
+        $loader = new PhpFileLoader($container, new FileLocator(), 'prod');
 
         $this->expectException(LogicException::class);
         $this->expectExceptionMessage('Using both #[When] and #[WhenNot] attributes on the same target is not allowed.');
@@ -309,12 +309,12 @@ public function testServiceWithServiceLocatorArgument()
         $this->assertEquals([new ServiceLocatorArgument($values)], $container->getDefinition('locator_dependent_inline_service')->getArguments());
     }
 
-    public function testConfigBuilderEnvConfigurator()
+    public function testArrayEnvConfigurator()
     {
         $container = new ContainerBuilder();
         $container->registerExtension(new \AcmeExtension());
-        $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Fixtures/config'), 'prod', new ConfigBuilderGenerator(sys_get_temp_dir()), true);
-        $loader->load('config_builder_env_configurator.php');
+        $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Fixtures/config'), 'prod');
+        $loader->load('array_env_configurator.php');
 
         $this->assertIsString($container->getExtensionConfig('acme')[0]['color']);
     }