Merge branch '7.4' into 8.0

* 7.4:
  [DependencyInjection][Routing] Fix nested config imports when returning PHP arrays
  fix compatibility with Relay 0.12.1
  [TypeInfo] Fix resolving use statements with line breaks
  [FrameworkBundle] Fix normalization of enums in workflow transitions
  Add missing return type for docblock Closure
  don't use a fixed date fixture when assertions depend on relative times
  [FrameworkBundle] Fix secrets:encrypt-from-local
  [Security] Add support for `Sec-Fetch-Site` to `SameOriginCsrfTokenManager`
  [Console] Optimize mostRecentlyEnteredValue() method
  [HttpClient] Add QUERY to the list of retriable HTTP methods
  Update regular expression in URL validator
  [AssetMapper] Fix parsing @import that don't use url()
  [Messenger] Add retry delay on amazon sqs
  [Serializer] CsvEncoder to escape values starting with line feed when escape formulas is enabled

Author: nicolas-grekas

Loader/PhpFileLoader.php

@@ -15,6 +15,7 @@
 use Symfony\Component\Config\Builder\ConfigBuilderGeneratorInterface;
 use Symfony\Component\Config\Builder\ConfigBuilderInterface;
 use Symfony\Component\Config\FileLocatorInterface;
+use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\DependencyInjection\Attribute\When;
 use Symfony\Component\DependencyInjection\Attribute\WhenNot;
 use Symfony\Component\DependencyInjection\Container;
@@ -109,8 +110,14 @@ public function load(mixed $resource, ?string $type = null): mixed
                             throw new InvalidArgumentException(\sprintf('Invalid key "%s" returned for the "%s" config builder; none or "services" expected in file "%s".', $key, get_debug_type($config), $path));
                         }
                         $yamlLoader = new YamlFileLoader($this->container, $this->locator, $this->env, $this->prepend);
+                        $yamlLoader->setResolver(new LoaderResolver([$this]));
                         $loadContent = new \ReflectionMethod(YamlFileLoader::class, 'loadContent');
-                        $loadContent->invoke($yamlLoader, ContainerConfigurator::processValue((array) $config), $path);
+                        ++$this->importing;
+                        try {
+                            $loadContent->invoke($yamlLoader, ContainerConfigurator::processValue((array) $config), $path);
+                        } finally {
+                            --$this->importing;
+                        }
                     } elseif ($config instanceof ConfigBuilderInterface) {
                         if (\is_string($key) && $config->getExtensionAlias() !== $key) {
                             throw new InvalidArgumentException(\sprintf('The extension alias "%s" of the "%s" config builder does not match the key "%s" in file "%s".', $config->getExtensionAlias(), get_debug_type($config), $key, $path));

Tests/Fixtures/config/config_builder.php

@@ -1,14 +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, ContainerConfigurator $c) {
-    $c->import('nested_config_builder.php');
-
-    $config->color('blue');
-};
+return [
+    'imports' => [
+        'nested_config_builder.php',
+    ],
+    new AcmeConfig(['color' => 'blue']),
+];

Tests/Loader/PhpFileLoaderTest.php

@@ -66,8 +66,8 @@ public function testPrependExtensionConfigWithLoadMethod()
         $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->load('config/config_builder.php');
+        $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Fixtures/config'), 'prod', new ConfigBuilderGenerator(sys_get_temp_dir()), true);
+        $loader->load('config_builder.php');
 
         $expected = [
             ['color' => 'red'],
@@ -82,8 +82,8 @@ 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');
+        $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Fixtures/config'), 'prod', new ConfigBuilderGenerator(sys_get_temp_dir()), true);
+        $loader->import('config_builder.php');
 
         $expected = [
             ['color' => 'red'],