diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index fff70fba75422..33e1342f2e2c5 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -1555,7 +1555,7 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde $container->setDefinition('annotations.cached_reader', $container->getDefinition('annotations.psr_cached_reader')); if ('php_array' === $config['cache']) { - $cacheService = 'annotations.psr_cache'; + $cacheService = 'annotations.cache_adapter'; // Enable warmer only if PHP array is used for cache $definition = $container->findDefinition('annotations.cache_warmer'); diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php index cec9f9499f6b2..e202c13f8ab03 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php @@ -68,10 +68,11 @@ param('kernel.cache_dir').'/annotations.php', service('cache.annotations'), ]) + ->tag('container.hot_path') ->set('annotations.cache', DoctrineProvider::class) ->args([ - service('annotations.cache_adapter') + service('annotations.cache_adapter'), ]) ->tag('container.hot_path') @@ -86,13 +87,6 @@ inline_service(ArrayAdapter::class), abstract_arg('Debug-Flag'), ]) - ->set('annotations.psr_cache', PhpArrayAdapter::class) - ->factory([PhpArrayAdapter::class, 'create']) - ->args([ - param('kernel.cache_dir').'/annotations.php', - service('cache.annotations'), - ]) - ->tag('container.hot_path') ; } };