8000 Fix merge · symfony/symfony@dc9fb50 · GitHub
[go: up one dir, main page]

Skip to content

Commit dc9fb50

Browse files
committed
Fix merge
1 parent 297cc32 commit dc9fb50

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@
140140
use Symfony\Component\RateLimiter\Storage\CacheStorage;
141141
use Symfony\Component\RemoteEvent\Attribute\AsRemoteEventConsumer;
142142
use Symfony\Component\RemoteEvent\RemoteEvent;
143-
use Symfony\Component\Routing\Loader\AnnotationClassLoader;
144143
use Symfony\Component\Routing\Loader\Psr4DirectoryLoader;
145144
use Symfony\Component\Scheduler\Attribute\AsSchedule;
146145
use Symfony\Component\Scheduler\Messenger\SchedulerTransportFactory;
@@ -1169,13 +1168,6 @@ private function registerRouterConfiguration(array $config, ContainerBuilder $co
11691168
if (!class_exists(Psr4DirectoryLoader::class)) {
11701169
$container->removeDefinition('routing.loader.psr4');
11711170
}
1172-
1173-
if ($this->isInitializedConfigEnabled('annotations') && (new \ReflectionClass(AnnotationClassLoader::class))->hasProperty('reader')) {
1174-
$container->getDefinition('routing.loader.annotation')->setArguments([
1175-
new Reference('annotation_reader'),
1176-
'%kernel.environment%',
1177-
]);
1178-
}
11791171
}
11801172

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

0 commit comments

Comments
 (0)
0