[FrameworkBundle] Make sure one can use fragments.hinclude_default_template

Author: Nyholm

DependencyInjection/FrameworkExtension.php

@@ -523,7 +523,7 @@ private function registerFragmentsConfiguration(array $config, ContainerBuilder
 
             return;
         }
-        if ($container->hasParameter('fragment.renderer.hinclude.global_template') && null !== $container->getParameter('fragment.renderer.hinclude.global_template') && null !== $config['hinclude_default_template']) {
+        if ($container->hasParameter('fragment.renderer.hinclude.global_template') && '' !== $container->getParameter('fragment.renderer.hinclude.global_template') && null !== $config['hinclude_default_template']) {
             throw new \LogicException('You cannot set both "templating.hinclude_default_template" and "fragments.hinclude_default_template", please only use "fragments.hinclude_default_template".');
         }
 

Tests/DependencyInjection/Fixtures/php/fragments_and_hinclude.php

@@ -0,0 +1,8 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'fragments' => [
+        'enabled' => true,
+        'hinclude_default_template' => 'global_hinclude_template',
+    ],
+]);

Tests/DependencyInjection/Fixtures/xml/fragments_and_hinclude.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:fragments enabled="true" hinclude-default-template="global_hinclude_template"/>
+    </framework:config>
+</container>

Tests/DependencyInjection/Fixtures/yml/fragments_and_hinclude.yml

@@ -0,0 +1,4 @@
+framework:
+    fragments:
+        enabled: true
+        hinclude_default_template: global_hinclude_template

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -170,6 +170,13 @@ public function testAmbiguousWhenBothTemplatingAndFragments()
         $this->createContainerFromFile('template_and_fragments');
     }
 
+    public function testFragmentsAndHinclude()
+    {
+        $container = $this->createContainerFromFile('fragments_and_hinclude');
+        $this->assertTrue($container->hasParameter('fragment.renderer.hinclude.global_template'));
+        $this->assertEquals('global_hinclude_template', $container->getParameter('fragment.renderer.hinclude.global_template'));
+    }
+
     public function testSsi()
     {
         $container = $this->createContainerFromFile('full');