symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
Lines changed: 6 additions & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
Lines changed: 6 additions & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
Lines changed: 17 additions & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
Lines changed: 17 additions & 1 deletion
@@ -92,6 +92,7 @@ public function import(mixed $resource, ?string $type = null, bool|string $ignor
             }
         } finally {
             --$this->importing;
+            $this->loadExtensionConfigs();
         }
 
         return null;
 
@@ -143,7 +143,12 @@ private function executeCallback(callable $callback, ContainerConfigurator $cont
         // Force load ContainerConfigurator to make env(), param() etc available.
         class_exists(ContainerConfigurator::class);
 
-        $callback(...$arguments);
+        ++$this->importing;
+        try {
+            $callback(...$arguments);
+        } finally {
+            --$this->importing;
+        }
 
         foreach ($configBuilders as $configBuilder) {
             $this->loadExtensionConfig($configBuilder->getExtensionAlias(), ContainerConfigurator::processValue($configBuilder->toArray()));
 
@@ -47,7 +47,7 @@ public function testLoad()
         $this->assertEquals('foo', $container->getParameter('foo'), '->load() loads a PHP file resource');
     }
 
-    public function testPrependExtensionConfig()
+    public function testPrependExtensionConfigWithLoadMethod()
     {
         $container = new ContainerBuilder();
         $container->registerExtension(new \AcmeExtension());
@@ -63,6 +63,22 @@ public function testPrependExtensionConfig()
         $this->assertSame($expected, $container->getExtensionConfig('acme'));
     }
 
+    public function testPrependExtensionConfigWithImportMethod()
+    {
+        $container = new ContainerBuilder();
+        $container->registerExtension(new \AcmeExtension());
+        $container->prependExtensionConfig('acme', ['foo' => 'bar']);
+        $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Fixtures'), 'prod', new ConfigBuilderGenerator(sys_get_temp_dir()), true);
+        $loader->import('config/config_builder.php');
+
+        $expected = [
+            ['color' => 'red'],
+            ['color' => 'blue'],
+            ['foo' => 'bar'],
+        ];
+        $this->assertSame($expected, $container->getExtensionConfig('acme'));
+    }
+
     public function testConfigServices()
     {
         $fixtures = realpath(__DIR__.'/../Fixtures');
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ public function import(mixed $resource, ?string $type = null, bool\|string $ignor`
`92`	`92`	`}`
`93`	`93`	`} finally {`
`94`	`94`	`--$this->importing;`
	`95`	`+ $this->loadExtensionConfigs();`
`95`	`96`	`}`
`96`	`97`
`97`	`98`	`return null;`