Ensure branch 7.4 will remain compatible with 8.0 once XML loaders are removed

nicolas-grekas · nicolas-grekas · commit 758c7f5bd5bb · 2025-10-02T17:08:47.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -180,6 +180,7 @@
 use Symfony\Component\RemoteEvent\RemoteEvent;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Routing\Loader\AttributeServicesLoader;
+use Symfony\Component\Routing\Loader\XmlFileLoader as RoutingXmlFileLoader;
 use Symfony\Component\Scheduler\Attribute\AsCronTask;
 use Symfony\Component\Scheduler\Attribute\AsPeriodicTask;
 use Symfony\Component\Scheduler\Attribute\AsSchedule;
@@ -1333,6 +1334,10 @@ private function registerRouterConfiguration(array $config, ContainerBuilder $co
 
         $loader->load('routing.php');
 
+        if (!class_exists(RoutingXmlFileLoader::class)) {
+            $container->removeDefinition('routing.loader.xml');
+        }
+
         if (!class_exists(AttributeServicesLoader::class)) {
             $container->removeDefinition('routing.loader.attribute.services');
         }
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -714,15 +714,16 @@ protected function getContainerLoader(ContainerInterface $container): Delegating
     {
         $env = $this->getEnvironment();
         $locator = new FileLocator($this);
-        $resolver = new LoaderResolver([
+        $resolver = new LoaderResolver(array_merge(class_exists(XmlFileLoader::class) ? [
             new XmlFileLoader($container, $locator, $env),
+        ] : [], [
             new YamlFileLoader($container, $locator, $env),
             new IniFileLoader($container, $locator, $env),
             new PhpFileLoader($container, $locator, $env, class_exists(ConfigBuilderGenerator::class) ? new ConfigBuilderGenerator($this->getBuildDir()) : null),
             new GlobFileLoader($container, $locator, $env),
             new DirectoryLoader($container, $locator, $env),
             new ClosureLoader($container, $env),
-        ]);
+        ]));
 
         return new DelegatingLoader($resolver);
     }
diff --git a/src/Symfony/Component/Routing/Tests/RouteCollectionTest.php b/src/Symfony/Component/Routing/Tests/RouteCollectionTest.php
@@ -105,9 +105,9 @@ public function testAddCollection()
     public function testAddCollectionWithResources()
     {
         $collection = new RouteCollection();
-        $collection->addResource($foo = new FileResource(__DIR__.'/Fixtures/foo.xml'));
+        $collection->addResource($foo = new FileResource(__DIR__.'/Fixtures/empty.yml'));
         $collection1 = new RouteCollection();
-        $collection1->addResource($foo1 = new FileResource(__DIR__.'/Fixtures/foo1.xml'));
+        $collection1->addResource($foo1 = new FileResource(__DIR__.'/Fixtures/file_resource.yml'));
         $collection->addCollection($collection1);
         $this->assertEquals([$foo, $foo1], $collection->getResources(), '->addCollection() merges resources');
     }
@@ -176,9 +176,9 @@ public function testAddPrefixOverridesDefaultsAndRequirements()
     public function testResource()
     {
         $collection = new RouteCollection();
-        $collection->addResource($foo = new FileResource(__DIR__.'/Fixtures/foo.xml'));
-        $collection->addResource($bar = new FileResource(__DIR__.'/Fixtures/bar.xml'));
-        $collection->addResource(new FileResource(__DIR__.'/Fixtures/foo.xml'));
+        $collection->addResource($foo = new FileResource(__DIR__.'/Fixtures/empty.yml'));
+        $collection->addResource($bar = new FileResource(__DIR__.'/Fixtures/file_resource.yml'));
+        $collection->addResource(new FileResource(__DIR__.'/Fixtures/empty.yml'));
 
         $this->assertEquals([$foo, $bar], $collection->getResources(),
             '->addResource() adds a resource and getResources() only returns unique ones by comparing the string representation');
