8000 [Routing] Deprecate annotations in favor of attributes · symfony/framework-bundle@723e407 · GitHub
[go: up one dir, main page]
Skip to content

Commit 723e407

Browse files
derrabusderrabus
committed
[Routing] Deprecate annotations in favor of attributes
1 parent 02656f2 commit 723e407

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

‎DependencyInjection/FrameworkExtension.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@
144144
use Symfony\Component\RateLimiter\Storage\CacheStorage;
145145
use Symfony\Component\RemoteEvent\Attribute\AsRemoteEventConsumer;
146146
use Symfony\Component\RemoteEvent\RemoteEvent;
147+
use Symfony\Component\Routing\Loader\AnnotationClassLoader;
147148
use Symfony\Component\Routing\Loader\Psr4DirectoryLoader;
148149
use Symfony\Component\Scheduler\Attribute\AsSchedule;
149150
use Symfony\Component\Scheduler\Messenger\SchedulerTransportFactory;
@@ -1179,6 +1180,13 @@ private function registerRouterConfiguration(array $config, ContainerBuilder $co
11791180
if (!class_exists(Psr4DirectoryLoader::class)) {
11801181
$container->removeDefinition('routing.loader.psr4');
11811182
}
1183+
1184+
if ($this->isInitializedConfigEnabled('annotations') && (new \ReflectionClass(AnnotationClassLoader::class))->hasProperty('reader')) {
1185+
$container->getDefinition('routing.loader.annotation')->setArguments([
1186+
new Reference('annotation_reader'),
1187+
'%kernel.environment%',
1188+
]);
1189+
}
11821190
}
11831191

11841192
private function registerSessionConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void

‎Resources/config/routing.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494

9595
->set('routing.loader.annotation', AnnotatedRouteControllerLoader::class)
9696
->args([
97-
service('annotation_reader')->nullOnInvalid(),
9897
'%kernel.environment%',
9998
])
10099
->tag('routing.loader', ['priority' => -10])

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"symfony/polyfill-mbstring": "~1.0",
3131
"symfony/filesystem": "^5.4|^6.0|^7.0",
3232
"symfony/finder": "^5.4|^6.0|^7.0",
33-
"symfony/routing": "^6.1|^7.0"
33+
"symfony/routing": "^6.4|^7.0"
3434
},
3535
"require-dev": {
3636
"doctrine/annotations": "^1.13.1|^2",

0 commit comments

Comments
 (0)
0