Merge branch '2.7' into 2.8
* 2.7: [FrameworkBundle] remove esi/ssi renderers if inactive
This commit is contained in:
commit
39bcfd4702
@ -217,6 +217,8 @@ class FrameworkExtension extends Extension
|
|||||||
private function registerEsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
|
private function registerEsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
|
||||||
{
|
{
|
||||||
if (!$this->isConfigEnabled($container, $config)) {
|
if (!$this->isConfigEnabled($container, $config)) {
|
||||||
|
$container->removeDefinition('fragment.renderer.esi');
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -226,6 +228,8 @@ class FrameworkExtension extends Extension
|
|||||||
private function registerSsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
|
private function registerSsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
|
||||||
{
|
{
|
||||||
if (!$this->isConfigEnabled($container, $config)) {
|
if (!$this->isConfigEnabled($container, $config)) {
|
||||||
|
$container->removeDefinition('fragment.renderer.ssi');
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -97,6 +97,15 @@ abstract class FrameworkExtensionTest extends TestCase
|
|||||||
$container = $this->createContainerFromFile('full');
|
$container = $this->createContainerFromFile('full');
|
||||||
|
|
||||||
$this->assertTrue($container->hasDefinition('esi'), '->registerEsiConfiguration() loads esi.xml');
|
$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()
|
public function testSsi()
|
||||||
@ -104,6 +113,15 @@ abstract class FrameworkExtensionTest extends TestCase
|
|||||||
$container = $this->createContainerFromFile('full');
|
$container = $this->createContainerFromFile('full');
|
||||||
|
|
||||||
$this->assertTrue($container->hasDefinition('ssi'), '->registerSsiConfiguration() loads ssi.xml');
|
$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()
|
public function testEnabledProfiler()
|
||||||
|
Reference in New Issue
Block a user