8000 [FrameworkBundle] [TwigBundle] Move the hinclude key from templating … · symfony/symfony@c045b3d · GitHub
[go: up one dir, main page]
Skip to content

Commit c045b3d

Browse files
author
Amrouche Hamza
committed
[FrameworkBundle] [TwigBundle] Move the hinclude key from templating to fragments
1 parent f587944 commit c045b3d

File tree

6 files changed

+9
-20
lines changed

6 files changed

+9
-20
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,8 @@ private function addFragmentsSection(ArrayNodeDefinition $rootNode)
191191
->info('fragments configuration')
192192
->canBeEnabled()
193193
->children()
194-
->scalarNode('path')->defaultValue('/_fragment')->end()
194+
->scalarNode('hinclude_default_template')->defaultNull()->end()
195+
->scalarNode('path')->defaultValue('/_fragment')->end()
195196
->end()
196197
->end()
197198
->end()
@@ -610,7 +611,6 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode)
610611
->then(function () { return ['enabled' => false, 'engines' => false]; })
611612
->end()
612613
->children()
613-
->scalarNode('hinclude_default_template')->defaultNull()->end()
614614
->scalarNode('cache')->end()
615615
->arrayNode('form')
616616
->addDefaultsIfNotSet()

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,13 @@ private function registerFragmentsConfiguration(array $config, ContainerBuilder
487487

488488
return;
489489
}
490+
$container->setParameter('fragment.renderer.hinclude.global_template', $config['hinclude_default_template']);
490491

492+
if (!$container->hasParameter('templating.engines') || ['twig'] == $container->getParameter('templating.engines')) {
493+
$container->getDefinition('fragment.renderer.hinclude')
494+
->addTag('kernel.fragment_renderer', ['alias' => 'hinclude'])
495+
->replaceArgument(0, new Reference('twig'));
496+
}
491497
$loader->load('fragment_listener.xml');
492498
$container->setParameter('fragment.path', $config['path']);
493499
}
@@ -905,8 +911,6 @@ private function registerTemplatingConfiguration(array $config, ContainerBuilder
905911
{
906912
$loader->load('templating.xml');
907913

908-
$container->setParameter('fragment.renderer.hinclude.global_template', $config['hinclude_default_template']);
909-
910914
if ($container->getParameter('kernel.debug')) {
911915
$logger = new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE);
912916

@@ -954,11 +958,6 @@ private function registerTemplatingConfiguration(array $config, ContainerBuilder
954958
$container->setAlias('templating', 'templating.engine.delegating')->setPublic(true);
955959
}
956960

957-
$container->getDefinition('fragment.renderer.hinclude')
958-
->addTag('kernel.fragment_renderer', ['alias' => 'hinclude'])
959-
->replaceArgument(0, new Reference('templating'))
960-
;
961-
962961
// configure the PHP engine if needed
963962
if (\in_array('php', $config['engines'], true)) {
964963
$loader->load('templating_php.xml');

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ protected static function getBundleDefaultConfig()
208208
'ssi' => ['enabled' => false],
209209
'fragments' => [
210210
'enabled' => false,
211+
'hinclude_default_template' => null,
211212
'path' => '/_fragment',
212213
],
213214
'profiler' => [
@@ -277,7 +278,6 @@ protected static function getBundleDefaultConfig()
277278
],
278279
'templating' => [
279280
'enabled' => false,
280-
'hinclude_default_template' => null,
281281
'form' => [
282282
'resources' => ['FrameworkBundle:Form'],
283283
],

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
'form' => [
99
'resources' => ['theme1', 'theme2'],
1010
],
11-
'hinclude_default_template' => 'global_hinclude_template',
1211
],
1312
'assets' => null,
1413
]);

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/templating.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ framework:
55
cache: /path/to/cache
66
form:
77
resources: [theme1, theme2]
8-
hinclude_default_template: global_hinclude_template
98
assets: ~

‎src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,6 @@ public function process(ContainerBuilder $container)
6565
if ($container->has('fragment.handler')) {
6666
$container->getDefinition('twig.extension.httpkernel')->addTag('twig.extension');
6767
$container->getDefinition('twig.runtime.httpkernel')->addTag('twig.runtime');
68-
69-
// inject Twig in the hinclude service if Twig is the only registered templating engine
70-
if ((!$container->hasParameter('templating.engines') || ['twig'] == $container->getParameter('templating.engines')) && $container->hasDefinition('fragment.renderer.hinclude')) {
71-
$container->getDefinition('fragment.renderer.hinclude')
72-
->addTag('kernel.fragment_renderer', ['alias' => 'hinclude'])
73-
->replaceArgument(0, new Reference('twig'))
74-
;
75-
}
7668
}
7769

7870
if (!$container->has('http_kernel')) {

0 commit comments

Comments
 (0)
0