Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 1484d7cb87c3 · 2021-11-18T16:21:00.000+01:00
* 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
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -856,7 +856,7 @@ private function addValidationSection(ArrayNodeDefinition $rootNode, callable $e
                     ->{$enableIfStandalone('symfony/validator', Validation::class)}()
                     ->children()
                         ->scalarNode('cache')->end()
-                        ->booleanNode('enable_annotations')->{!class_exists(FullStack::class) && $willBeAvailable('doctrine/annotations', Annotation::class, 'symfony/validator') ? 'defaultTrue' : 'defaultFalse'}()->end()
+                        ->booleanNode('enable_annotations')->{!class_exists(FullStack::class) ? 'defaultTrue' : 'defaultFalse'}()->end()
                         ->arrayNode('static_method')
                             ->defaultValue(['loadValidatorMetadata'])
                             ->prototype('scalar')->end()
@@ -965,7 +965,7 @@ private function addSerializerSection(ArrayNodeDefinition $rootNode, callable $e
                     ->info('serializer configuration')
                     ->{$enableIfStandalone('symfony/serializer', Serializer::class)}()
                     ->children()
-                        ->booleanNode('enable_annotations')->{!class_exists(FullStack::class) && $willBeAvailable('doctrine/annotations', Annotation::class, 'symfony/serializer') ? 'defaultTrue' : 'defaultFalse'}()->end()
+                        ->booleanNode('enable_annotations')->{!class_exists(FullStack::class) ? 'defaultTrue' : 'defaultFalse'}()->end()
                         ->scalarNode('name_converter')->end()
                         ->scalarNode('circular_reference_handler')->end()
                         ->scalarNode('max_depth_handler')->end()
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig
@@ -4,12 +4,7 @@
 
 {% block toolbar %}
     {% if collector.firewall %}
-        {% if collector.token %}
-            {% set is_authenticated = collector.enabled and collector.authenticated  %}
-            {% set color_code = not is_authenticated ? 'yellow' %}
-        {% else %}
-            {% set color_code = '' %}
-        {% endif %}
+        {% set color_code = collector.enabled and not collector.authenticatorManagerEnabled ? 'yellow' %}
 
         {% set icon %}
             {{ include('@Security/Collector/icon.svg') }}
@@ -36,7 +31,7 @@
 
                         <div class="sf-toolbar-info-piece">
                             <b>Authenticated</b>
-                            <span class="sf-toolbar-status sf-toolbar-status-{{ is_authenticated ? 'green' : 'yellow' }}">{{ is_authenticated ? 'Yes' : 'No' }}</span>
+                            <span class="sf-toolbar-status sf-toolbar-status-{{ collector.authenticated ? 'green' : 'yellow' }}">{{ collector.authenticated ? 'Yes' : 'No' }}</span>
                         </div>
 
                         <div class="sf-toolbar-info-piece">
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
@@ -38,6 +38,11 @@ class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface,
     ];
 
     public function __construct(array $defaultContext = [])
+    {
+        $this->setDefaultContext($defaultContext);
+    }
+
+    public function setDefaultContext(array $defaultContext): void
     {
         $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
     }

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,11 @@ class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface,`
`38`	`38`	`];`
`39`	`39`
`40`	`40`	`public function __construct(array $defaultContext = [])`
	`41`	`+ {`
	`42`	`+ $this->setDefaultContext($defaultContext);`
	`43`	`+ }`
	`44`	`+`
	`45`	`+ public function setDefaultContext(array $defaultContext): void`
`41`	`46`	`{`
`42`	`47`	`$this->defaultContext = array_merge($this->defaultContext, $defaultContext);`
`43`	`48`	`}`