disable unusable fragment renderers

xabbuh · xabbuh · commit 719d723a1ef9 · 2017-06-24T15:56:34.000+02:00
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -392,6 +392,8 @@ private function registerFormConfiguration($config, ContainerBuilder $container,
     private function registerEsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         if (!$this->isConfigEnabled($container, $config)) {
+            $container->removeDefinition('fragment.renderer.esi');
+
             return;
         }
 
@@ -408,6 +410,8 @@ private function registerEsiConfiguration(array $config, ContainerBuilder $conta
     private function registerSsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         if (!$this->isConfigEnabled($container, $config)) {
+            $container->removeDefinition('fragment.renderer.ssi');
+
             return;
         }
 
@@ -424,6 +428,8 @@ private function registerSsiConfiguration(array $config, ContainerBuilder $conta
     private function registerFragmentsConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         if (!$this->isConfigEnabled($container, $config)) {
+            $container->removeDefinition('fragment.renderer.hinclude');
+
             return;
         }
 
diff --git a/Tests/DependencyInjection/Fixtures/php/esi_and_ssi_without_fragments.php b/Tests/DependencyInjection/Fixtures/php/esi_and_ssi_without_fragments.php
@@ -0,0 +1,13 @@
+<?php
+
+$container->loadFromExtension('framework', array(
+    'fragments' => array(
+        'enabled' => false,
+    ),
+    'esi' => array(
+        'enabled' => true,
+    ),
+    'ssi' => array(
+        'enabled' => true,
+    ),
+));
diff --git a/Tests/DependencyInjection/Fixtures/php/esi_disabled.php b/Tests/DependencyInjection/Fixtures/php/esi_disabled.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', array(
+    'esi' => array(
+        'enabled' => false,
+    ),
+));
diff --git a/Tests/DependencyInjection/Fixtures/php/ssi_disabled.php b/Tests/DependencyInjection/Fixtures/php/ssi_disabled.php
@@ -0,0 +1,7 @@
+<?php
+
+$container->loadFromExtension('framework', array(
+    'ssi' => array(
+        'enabled' => false,
+    ),
+));
diff --git a/Tests/DependencyInjection/Fixtures/xml/esi_and_ssi_without_fragments.xml b/Tests/DependencyInjection/Fixtures/xml/esi_and_ssi_without_fragments.xml
@@ -0,0 +1,13 @@
+<?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 http://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:fragments enabled="false" />
+        <framework:esi enabled="true" />
+        <framework:ssi enabled="true" />
+    </framework:config>
+</container>
diff --git a/Tests/DependencyInjection/Fixtures/xml/esi_disabled.xml b/Tests/DependencyInjection/Fixtures/xml/esi_disabled.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 http://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:esi enabled="false" />
+    </framework:config>
+</container>
diff --git a/Tests/DependencyInjection/Fixtures/xml/ssi_disabled.xml b/Tests/DependencyInjection/Fixtures/xml/ssi_disabled.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 http://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:ssi enabled="false" />
+    </framework:config>
+</container>
diff --git a/Tests/DependencyInjection/Fixtures/yml/esi_and_ssi_without_fragments.yml b/Tests/DependencyInjection/Fixtures/yml/esi_and_ssi_without_fragments.yml
@@ -0,0 +1,7 @@
+framework:
+    fragments:
+        enabled: false
+    esi:
+        enabled: true
+    ssi:
+        enabled: true
diff --git a/Tests/DependencyInjection/Fixtures/yml/esi_disabled.yml b/Tests/DependencyInjection/Fixtures/yml/esi_disabled.yml
@@ -0,0 +1,3 @@
+framework:
+    esi:
+        enabled: false
diff --git a/Tests/DependencyInjection/Fixtures/yml/ssi_disabled.yml b/Tests/DependencyInjection/Fixtures/yml/ssi_disabled.yml
@@ -0,0 +1,3 @@
+framework:
+    ssi:
+        enabled: false
diff --git a/Tests/DependencyInjection/FrameworkExtensionTest.php b/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -132,13 +132,38 @@ public function testEsi()
         $container = $this->createContainerFromFile('full');
 
         $this->assertTrue($container->hasDefinition('esi'), '->registerEsiConfiguration() loads esi.xml');
+        $this->assertTrue($container->hasDefinition('fragment.renderer.esi'), 'The ESI fragment renderer is registered');
+    }
+
+    public function testEsiDisabled()
+    {
+        $container = $this->createContainerFromFile('esi_disabled');
+
+        $this->assertFalse($container->hasDefinition('fragment.renderer.esi'), 'The ESI fragment renderer is not registered');
     }
 
     public function testSsi()
     {
         $container = $this->createContainerFromFile('full');
 
         $this->assertTrue($container->hasDefinition('ssi'), '->registerSsiConfiguration() loads ssi.xml');
+        $this->assertTrue($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is registered');
+    }
+
+    public function testSsiDisabled()
+    {
+        $container = $this->createContainerFromFile('ssi_disabled');
+
+        $this->assertFalse($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is not registered');
+    }
+
+    public function testEsiAndSsiWithoutFragments()
+    {
+        $container = $this->createContainerFromFile('esi_and_ssi_without_fragments');
+
+        $this->assertFalse($container->hasDefinition('fragment.renderer.hinclude'), 'The HInclude fragment renderer is not registered');
+        $this->assertTrue($container->hasDefinition('fragment.renderer.esi'), 'The ESI fragment renderer is registered');
+        $this->assertTrue($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is registered');
     }
 
     public function testEnabledProfiler()

Original file line number	Diff line number	Diff line change
`@@ -392,6 +392,8 @@ private function registerFormConfiguration($config, ContainerBuilder $container,`
`392`	`392`	`private function registerEsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)`
`393`	`393`	`{`
`394`	`394`	`if (!$this->isConfigEnabled($container, $config)) {`
	`395`	`+ $container->removeDefinition('fragment.renderer.esi');`
	`396`	`+`
`395`	`397`	`return;`
`396`	`398`	`}`
`397`	`399`
`@@ -408,6 +410,8 @@ private function registerEsiConfiguration(array $config, ContainerBuilder $conta`
`408`	`410`	`private function registerSsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)`
`409`	`411`	`{`
`410`	`412`	`if (!$this->isConfigEnabled($container, $config)) {`
	`413`	`+ $container->removeDefinition('fragment.renderer.ssi');`
	`414`	`+`
`411`	`415`	`return;`
`412`	`416`	`}`
`413`	`417`
`@@ -424,6 +428,8 @@ private function registerSsiConfiguration(array $config, ContainerBuilder $conta`
`424`	`428`	`private function registerFragmentsConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)`
`425`	`429`	`{`
`426`	`430`	`if (!$this->isConfigEnabled($container, $config)) {`
	`431`	`+ $container->removeDefinition('fragment.renderer.hinclude');`
	`432`	`+`
`427`	`433`	`return;`
`428`	`434`	`}`
`429`	`435`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+framework:`
	`2`	`+ esi:`
	`3`	`+ enabled: false`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+framework:`
	`2`	`+ ssi:`
	`3`	`+ enabled: false`