[Routing] Simplify importing routes defined on controller services

nicolas-grekas · nicolas-grekas · commit 13e25caae7da · 2025-11-04T15:59:16.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
@@ -79,15 +79,13 @@ private function configureRoutes(RoutingConfigurator $routes): void
         $routes->import($configDir.'/{routes}/'.$this->environment.'/*.{php,yaml}');
         $routes->import($configDir.'/{routes}/*.{php,yaml}');
 
+        $routes->import('routing.controllers');
+
         if (is_file($this->getConfigDir().'/routes.yaml')) {
             $routes->import($configDir.'/routes.yaml');
         } else {
             $routes->import($configDir.'/{routes}.php');
         }
-
-        if ($fileName = (new \ReflectionObject($this))->getFileName()) {
-            $routes->import($fileName, 'attribute');
-        }
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/reference.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/reference.php
@@ -184,8 +184,7 @@ public static function config(array $config): array
  *
  *     return Routes::config([
  *         'controllers' => [
- *             'resource' => 'attributes',
- *             'type' => 'tagged_services',
+ *             'resource' => 'routing.controllers',
  *         ],
  *     ]);
  *     ```
diff --git a/src/Symfony/Component/Routing/Loader/AttributeServicesLoader.php b/src/Symfony/Component/Routing/Loader/AttributeServicesLoader.php
@@ -42,6 +42,6 @@ public function load(mixed $resource, ?string $type = null): RouteCollection
 
     public function supports(mixed $resource, ?string $type = null): bool
     {
-        return 'tagged_services' === $type && 'attributes' === $resource;
+        return 'routing.controllers' === $resource;
     }
 }
diff --git a/src/Symfony/Component/Routing/Loader/Configurator/RoutesReference.php b/src/Symfony/Component/Routing/Loader/Configurator/RoutesReference.php
@@ -26,8 +26,7 @@
  *
  *     return Routes::config([
  *         'controllers' => [
- *             'resource' => 'attributes',
- *             'type' => 'tagged_services',
+ *             'resource' => 'routing.controllers',
  *         ],
  *     ]);
  *     ```
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AttributeServicesLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AttributeServicesLoaderTest.php
@@ -26,8 +26,8 @@ public function testSupports()
 
         $this->assertFalse($loader->supports('attributes', null));
         $this->assertFalse($loader->supports('attributes', 'attribute'));
-        $this->assertFalse($loader->supports('other', 'tagged_services'));
-        $this->assertTrue($loader->supports('attributes', 'tagged_services'));
+        $this->assertFalse($loader->supports('other', 'routing.controllers'));
+        $this->assertTrue($loader->supports('routing.controllers'));
     }
 
     public function testDelegatesToAttributeLoaderAndMergesCollections()
@@ -47,7 +47,7 @@ public function testDelegatesToAttributeLoaderAndMergesCollections()
         $attributeLoader->setResolver($resolver);
         $servicesLoader->setResolver($resolver);
 
-        $collection = $servicesLoader->load('attributes', 'tagged_services');
+        $collection = $servicesLoader->load('routing.controllers');
 
         $this->assertArrayHasKey('action', $collection->all());
         $this->assertArrayHasKey('put', $collection->all());

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,6 @@ public function load(mixed $resource, ?string $type = null): RouteCollection`
`42`	`42`
`43`	`43`	`public function supports(mixed $resource, ?string $type = null): bool`
`44`	`44`	`{`
`45`		`- return 'tagged_services' === $type && 'attributes' === $resource;`
	`45`	`+ return 'routing.controllers' === $resource;`
`46`	`46`	`}`
`47`	`47`	`}`