Merge branch '2.8' into 3.3
* 2.8: [FrameworkBundle] remove esi/ssi renderers if inactive
This commit is contained in:
commit
e5d178e55a
@ -362,6 +362,8 @@ class FrameworkExtension extends Extension
|
||||
private function registerEsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
|
||||
{
|
||||
if (!$this->isConfigEnabled($container, $config)) {
|
||||
$container->removeDefinition('fragment.renderer.esi');
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@ -371,6 +373,8 @@ class FrameworkExtension extends Extension
|
||||
private function registerSsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
|
||||
{
|
||||
if (!$this->isConfigEnabled($container, $config)) {
|
||||
$container->removeDefinition('fragment.renderer.ssi');
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -131,6 +131,15 @@ abstract class FrameworkExtensionTest extends TestCase
|
||||
$container = $this->createContainerFromFile('full');
|
||||
|
||||
$this->assertTrue($container->hasDefinition('esi'), '->registerEsiConfiguration() loads esi.xml');
|
||||
$this->assertTrue($container->hasDefinition('fragment.renderer.esi'));
|
||||
}
|
||||
|
||||
public function testEsiInactive()
|
||||
{
|
||||
$container = $this->createContainerFromFile('default_config');
|
||||
|
||||
$this->assertFalse($container->hasDefinition('fragment.renderer.esi'));
|
||||
$this->assertFalse($container->hasDefinition('esi'));
|
||||
}
|
||||
|
||||
public function testSsi()
|
||||
@ -138,6 +147,15 @@ abstract class FrameworkExtensionTest extends TestCase
|
||||
$container = $this->createContainerFromFile('full');
|
||||
|
||||
$this->assertTrue($container->hasDefinition('ssi'), '->registerSsiConfiguration() loads ssi.xml');
|
||||
$this->assertTrue($container->hasDefinition('fragment.renderer.ssi'));
|
||||
}
|
||||
|
||||
public function testSsiInactive()
|
||||
{
|
||||
$container = $this->createContainerFromFile('default_config');
|
||||
|
||||
$this->assertFalse($container->hasDefinition('fragment.renderer.ssi'));
|
||||
$this->assertFalse($container->hasDefinition('ssi'));
|
||||
}
|
||||
|
||||
public function testEnabledProfiler()
|
||||
|
Reference in New Issue
Block a user