Skip to content

Commit 98e98dd

Browse files
Merge branch '5.4' into 6.0
* 5.4: [WebProfilerBundle] Tweak the colors of the security panel Add a setter on DateTimeNormalizer to change the default context at runtime [FrameworkBundle] Fix default PHP attributes support in validation and serializer configuration when doctrine/annotations is not installed with PHP 8
2 parents 28baff7 + c0651c9 commit 98e98dd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

DependencyInjection/Configuration.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ private function addValidationSection(ArrayNodeDefinition $rootNode, callable $e
856856
->{$enableIfStandalone('symfony/validator', Validation::class)}()
857857
->children()
858858
->scalarNode('cache')->end()
859-
->booleanNode('enable_annotations')->{!class_exists(FullStack::class) && $willBeAvailable('doctrine/annotations', Annotation::class, 'symfony/validator') ? 'defaultTrue' : 'defaultFalse'}()->end()
859+
->booleanNode('enable_annotations')->{!class_exists(FullStack::class) ? 'defaultTrue' : 'defaultFalse'}()->end()
860860
->arrayNode('static_method')
861861
->defaultValue(['loadValidatorMetadata'])
862862
->prototype('scalar')->end()
@@ -965,7 +965,7 @@ private function addSerializerSection(ArrayNodeDefinition $rootNode, callable $e
965965
->info('serializer configuration')
966966
->{$enableIfStandalone('symfony/serializer', Serializer::class)}()
967967
->children()
968-
->booleanNode('enable_annotations')->{!class_exists(FullStack::class) && $willBeAvailable('doctrine/annotations', Annotation::class, 'symfony/serializer') ? 'defaultTrue' : 'defaultFalse'}()->end()
968+
->booleanNode('enable_annotations')->{!class_exists(FullStack::class) ? 'defaultTrue' : 'defaultFalse'}()->end()
969969
->scalarNode('name_converter')->end()
970970
->scalarNode('circular_reference_handler')->end()
971971
->scalarNode('max_depth_handler')->end()

0 commit comments

Comments
 (0)