[FrameworkBundle] changed the default value of annotation setting based on the existence of Doctrine Annotations

fabpot · fabpot · commit 98ce21a35122 · 2017-01-06T16:42:03.000-08:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -601,7 +601,7 @@ private function addValidationSection(ArrayNodeDefinition $rootNode)
                     ->canBeEnabled()
                     ->children()
                         ->scalarNode('cache')->end()
-                        ->booleanNode('enable_annotations')->defaultFalse()->end()
+                        ->booleanNode('enable_annotations')->{class_exists(Annotation::class) ? 'defaultTrue' : 'defaultFalse'}()->end()
                         ->arrayNode('static_method')
                             ->defaultValue(array('loadValidatorMetadata'))
                             ->prototype('scalar')->end()
@@ -644,7 +644,7 @@ private function addSerializerSection(ArrayNodeDefinition $rootNode)
                     ->info('serializer configuration')
                     ->canBeEnabled()
                     ->children()
-                        ->booleanNode('enable_annotations')->defaultFalse()->end()
+                        ->booleanNode('enable_annotations')->{class_exists(Annotation::class) ? 'defaultTrue' : 'defaultFalse'}()->end()
                         ->scalarNode('cache')->end()
                         ->scalarNode('name_converter')->end()
                     ->end()
