Skip to content

[Routing] Simplify importing routes defined on controller services #62302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabpot merged 1 commit into from
Nov 5, 2025
+8 −12
Merged

[Routing] Simplify importing routes defined on controller services #62302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
}

/**
Expand Down
3 changes: 1 addition & 2 deletions src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/reference.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,7 @@ public static function config(array $config): array
*
* return Routes::config([
* 'controllers' => [
* 'resource' => 'attributes',
* 'type' => 'tagged_services',
* 'resource' => 'routing.controllers',
* ],
* ]);
* ```
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Routing/Loader/AttributeServicesLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
3 changes: 1 addition & 2 deletions src/Symfony/Component/Routing/Loader/Configurator/RoutesReference.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
*
* return Routes::config([
* 'controllers' => [
* 'resource' => 'attributes',
* 'type' => 'tagged_services',
* 'resource' => 'routing.controllers',
* ],
* ]);
* ```
Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Component/Routing/Tests/Loader/AttributeServicesLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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());
Expand Down
Loading