8000 [FrameworkBundle] remove esi/ssi renderers if inactive by dmaicher · Pull Request #25489 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[FrameworkBundle] remove esi/ssi renderers if inactive #25489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 14, 2017
Merged

[FrameworkBundle] remove esi/ssi renderers if inactive #25489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[FrameworkBundle] remove esi/ssi renderers if inactive
  • Loading branch information
@dmaicher
dmaicher committed Dec 13, 2017
commit e1c36525fd55b1eb187ce5aefbdc2d39c7286f86
4 changes: 4 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down
18 changes: 18 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View file
Open in desktop
< 5582 /tr>
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,31 @@ public function testEsi()
$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()
{
$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()
Expand Down
0