[FrameworkBundle] remove esi/ssi renderers if inactive

dmaicher · dmaicher · commit a121cfea322d · 2017-12-13T20:26:04.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -213,6 +213,8 @@ private function registerFormConfiguration(array $config, ContainerBuilder $cont
     private function registerEsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         if (!$this->isConfigEnabled($container, $config)) {
+            $container->removeDefinition('fragment.renderer.esi');
+
             return;
         }
 
@@ -222,6 +224,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;
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -98,13 +98,29 @@ public function testEsi()
         $this->assertTrue($container->hasDefinition('esi'), '->registerEsiConfiguration() loads esi.xml');
     }
 
+    public function testEsiInactive()
+    {
+        $container = $this->createContainerFromFile('default_config');
+
+        $this->assertFalse($container->hasDefinition('fragment.renderer.esi'));
+        $this->assertFalse($container->hasDefinition('esi'));
+    }
+
     public function testSsi()
     {
         $container = $this->createContainerFromFile('full');
 
         $this->assertTrue($container->hasDefinition('ssi'), '->registerSsiConfiguration() loads ssi.xml');
     }
 
+    public function testSsiInactive()
+    {
+        $container = $this->createContainerFromFile('default_config');
+        
+        $this->assertFalse($container->hasDefinition('fragment.renderer.ssi'));
+        $this->assertFalse($container->hasDefinition('ssi'));
+    }
+
     public function testEnabledProfiler()
     {
         $container = $this->createContainerFromFile('profiler');

Original file line number	Diff line number	Diff line change
`@@ -213,6 +213,8 @@ private function registerFormConfiguration(array $config, ContainerBuilder $cont`
`213`	`213`	`private function registerEsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)`
`214`	`214`	`{`
`215`	`215`	`if (!$this->isConfigEnabled($container, $config)) {`
	`216`	`+ $container->removeDefinition('fragment.renderer.esi');`
	`217`	`+`
`216`	`218`	`return;`
`217`	`219`	`}`
`218`	`220`
`@@ -222,6 +224,8 @@ private function registerEsiConfiguration(array $config, ContainerBuilder $conta`
`222`	`224`	`private function registerSsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)`
`223`	`225`	`{`
`224`	`226`	`if (!$this->isConfigEnabled($container, $config)) {`
	`227`	`+ $container->removeDefinition('fragment.renderer.ssi');`
	`228`	`+`
`225`	`229`	`return;`
`226`	`230`	`}`
`227`	`231`