[DependencyInjection][Routing] Fix nested config imports when returning PHP arrays

Author: nicolas-grekas

Loader/PhpFileLoader.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Routing\Loader;
 
 use Symfony\Component\Config\Loader\FileLoader;
+use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Routing\Exception\InvalidArgumentException;
 use Symfony\Component\Routing\Loader\Configurator\AliasConfigurator;
@@ -114,6 +115,7 @@ private function loadRoutes(RouteCollection $collection, mixed $routes, string $
         }
 
         $loader = new YamlFileLoader($this->locator, $this->env);
+        $loader->setResolver(new LoaderResolver([$this]));
 
         \Closure::bind(function () use ($collection, $routes, $path, $file) {
             foreach ($routes as $name => $config) {
@@ -148,7 +150,7 @@ private function loadRoutes(RouteCollection $collection, mixed $routes, string $
                     }
                 }
             }
-        }, $loader, $loader::class)();
+        }, $loader, YamlFileLoader::class)();
     }
 }
 

Tests/Fixtures/importer-php-returns-array-with-import.yml

@@ -0,0 +1,3 @@
+routes_from_php:
+    resource: validpattern.php
+    type: php

Tests/Fixtures/importer-php-returns-array.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'blog_show' => [
+        'resource' => 'importer-php-returns-array-with-import.yml',
+    ],
+    'direct' => [
+        'path' => '/direct',
+    ],
+];

Tests/Loader/PhpFileLoaderTest.php

@@ -392,6 +392,17 @@ public function testWhenEnvWithArray()
         $this->assertSame('/x', $routes->get('x')->getPath());
     }
 
+    public function testYamlImportsAreResolvedWhenProcessingPhpReturnedArrays()
+    {
+        $locator = new FileLocator([__DIR__.'/../Fixtures']);
+        $loader = new PhpFileLoader($locator);
+
+        $routes = $loader->load('importer-php-returns-array.php');
+
+        $this->assertSame('/blog/{slug}', $routes->get('blog_show')->getPath());
+        $this->assertSame('/direct', $routes->get('direct')->getPath());
+    }
+
     #[DataProvider('providePsr4ConfigFiles')]
     public function testImportAttributesWithPsr4Prefix(string $configFile)
     {