From e38be091cef535206cf1d6625806bf5f17095f53 Mon Sep 17 00:00:00 2001 From: Maxime Steinhausser Date: Sun, 4 Dec 2016 20:22:06 +0100 Subject: [PATCH] [FrameworkBundle] framework.annotations default should be true only if doctrine/annotations is installed --- .../FrameworkBundle/DependencyInjection/Configuration.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php index 5c6208e6e46f2..4a7dfa2930891 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php @@ -11,6 +11,7 @@ namespace Symfony\Bundle\FrameworkBundle\DependencyInjection; +use Doctrine\Common\Annotations\Annotation; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; @@ -602,7 +603,7 @@ private function addAnnotationsSection(ArrayNodeDefinition $rootNode) ->children() ->arrayNode('annotations') ->info('annotation configuration') - ->canBeDisabled() + ->{class_exists(Annotation::class) ? 'canBeDisabled' : 'canBeEnabled'}() ->children() ->scalarNode('cache')->defaultValue('php_array')->end() ->scalarNode('file_cache_dir')->defaultValue('%kernel.cache_dir%/annotations')->end()