bug #38580 [FrameworkBundle] fix config declaration of http_cache option (nicolas-grekas)

fabpot · fabpot · commit c61f65778d51 · 2020-10-16T06:55:53.000+02:00
This PR was merged into the 5.x branch. Discussion ---------- [FrameworkBundle] fix config declaration of http_cache option | Q | A | ------------- | --- | Branch? | 5.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Addresses comments from @stof in #37351 (review) Commits ------- 2514cf1 [FrameworkBundle] fix config declaration of http_cache option
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -218,6 +218,7 @@ private function addHttpCacheSection(ArrayNodeDefinition $rootNode)
                 ->arrayNode('http_cache')
                     ->info('HTTP cache configuration')
                     ->canBeEnabled()
+                    ->fixXmlConfig('private_header')
                     ->children()
                         ->booleanNode('debug')->defaultValue('%kernel.debug%')->end()
                         ->enumNode('trace_level')
@@ -227,8 +228,6 @@ private function addHttpCacheSection(ArrayNodeDefinition $rootNode)
                         ->integerNode('default_ttl')->end()
                         ->arrayNode('private_headers')
                             ->performNoDeepMerging()
-                            ->requiresAtLeastOneElement()
-                            ->fixXmlConfig('private_header')
                             ->scalarPrototype()->end()
                         ->end()
                         ->booleanNode('allow_reload')->end()
