[FrameworkBundle] [TwigBundle] Move the hinclude key from templating to fragments

Amrouche Hamza · Amrouche Hamza · commit 98c6732f6d51 · 2019-04-07T12:33:52.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -191,6 +191,7 @@ private function addFragmentsSection(ArrayNodeDefinition $rootNode)
                     ->info('fragments configuration')
                     ->canBeEnabled()
                     ->children()
+                        ->scalarNode('hinclude_default_template')->defaultNull()->end()
                         ->scalarNode('path')->defaultValue('/_fragment')->end()
                     ->end()
                 ->end()
@@ -603,6 +604,16 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode)
         $rootNode
             ->children()
                 ->arrayNode('templating')
+                ->validate()
+                    ->ifTrue(function ($v) {
+                        return null !== $v['hinclude_default_template'];
+                    })
+                    ->then(function ($v) {
+                        @trigger_error('Using the key "hinclude_default_template" in the templating is deprecated since Symfony 4.3. Use the config key under fragments instead.', E_USER_DEPRECATED);
+
+                        return $v;
+                    })
+                ->end()
                     ->info('templating configuration')
                     ->canBeEnabled()
                     ->beforeNormalization()
@@ -612,6 +623,7 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode)
                     ->children()
                         ->scalarNode('hinclude_default_template')->defaultNull()->end()
                         ->scalarNode('cache')->end()
+
                         ->arrayNode('form')
                             ->addDefaultsIfNotSet()
                             ->fixXmlConfig('resource')
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -487,6 +487,7 @@ private function registerFragmentsConfiguration(array $config, ContainerBuilder
 
             return;
         }
+        $container->setParameter('fragment.renderer.hinclude.global_template', $config['hinclude_default_template']);
 
         $loader->load('fragment_listener.xml');
         $container->setParameter('fragment.path', $config['path']);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -209,6 +209,7 @@ protected static function getBundleDefaultConfig()
             'fragments' => [
                 'enabled' => false,
                 'path' => '/_fragment',
+                'hinclude_default_template' => null,
             ],
             'profiler' => [
                 'enabled' => false,

Original file line number	Diff line number	Diff line change
`@@ -487,6 +487,7 @@ private function registerFragmentsConfiguration(array $config, ContainerBuilder`
`487`	`487`
`488`	`488`	`return;`
`489`	`489`	`}`
	`490`	`+ $container->setParameter('fragment.renderer.hinclude.global_template', $config['hinclude_default_template']);`
`490`	`491`
`491`	`492`	`$loader->load('fragment_listener.xml');`
`492`	`493`	`$container->setParameter('fragment.path', $config['path']);`