Skip to content

Commit 4868186

Browse files
fabpotfabpot
committed
feature #23272 [FrameworkBundle] disable unusable fragment renderers (xabbuh)
This PR was merged into the 3.4 branch. Discussion ---------- [FrameworkBundle] disable unusable fragment renderers | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #21733 | License | MIT | Doc PR | Commits ------- 2b3d7f021d disable unusable fragment renderers
2 parents edc62cf + 719d723 commit 4868186

11 files changed

+106
-0
lines changed

‎DependencyInjection/FrameworkExtension.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,8 @@ private function registerFormConfiguration($config, ContainerBuilder $container,
392392
private function registerEsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
393393
{
394394
if (!$this->isConfigEnabled($container, $config)) {
395+
$container->removeDefinition('fragment.renderer.esi');
396+
395397
return;
396398
}
397399

@@ -408,6 +410,8 @@ private function registerEsiConfiguration(array $config, ContainerBuilder $conta
408410
private function registerSsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
409411
{
410412
if (!$this->isConfigEnabled($container, $config)) {
413+
$container->removeDefinition('fragment.renderer.ssi');
414+
411415
return;
412416
}
413417

@@ -424,6 +428,8 @@ private function registerSsiConfiguration(array $config, ContainerBuilder $conta
424428
private function registerFragmentsConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
425429
{
426430
if (!$this->isConfigEnabled($container, $config)) {
431+
$container->removeDefinition('fragment.renderer.hinclude');
432+
427433
return;
428434
}
429435

‎Tests/DependencyInjection/Fixtures/php/esi_and_ssi_without_fragments.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
3+
$container->loadFromExtension('framework', array(
4+
'fragments' => array(
5+
'enabled' => false,
6+
),
7+
'esi' => array(
8+
'enabled' => true,
9+
),
10+
'ssi' => array(
11+
'enabled' => true,
12+
),
13+
));

‎Tests/DependencyInjection/Fixtures/php/esi_disabled.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?php
2+
3+
$container->loadFromExtension('framework', array(
4+
'esi' => array(
5+
'enabled' => false,
6+
),
7+
));

‎Tests/DependencyInjection/Fixtures/php/ssi_disabled.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?php
2+
3+
$container->loadFromExtension('framework', array(
4+
'ssi' => array(
5+
'enabled' => false,
6+
),
7+
));

‎Tests/DependencyInjection/Fixtures/xml/esi_and_ssi_without_fragments.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" ?>
2+
<container xmlns="http://symfony.com/schema/dic/services"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:framework="http://symfony.com/schema/dic/symfony"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
6+
http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
7+
8+
<framework:config>
9+
<framework:fragments enabled="false" />
10+
<framework:esi enabled="true" />
11+
<framework:ssi enabled="true" />
12+
</framework:config>
13+
</container>

‎Tests/DependencyInjection/Fixtures/xml/esi_disabled.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" ?>
2+
<container xmlns="http://symfony.com/schema/dic/services"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:framework="http://symfony.com/schema/dic/symfony"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
6+
http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
7+
8+
<framework:config>
9+
<framework:esi enabled="false" />
10+
</framework:config>
11+
</container>

‎Tests/DependencyInjection/Fixtures/xml/ssi_disabled.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" ?>
2+
<container xmlns="http://symfony.com/schema/dic/services"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:framework="http://symfony.com/schema/dic/symfony"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
6+
http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
7+
8+
<framework:config>
9+
<framework:ssi enabled="false" />
10+
</framework:config>
11+
</container>

‎Tests/DependencyInjection/Fixtures/yml/esi_and_ssi_without_fragments.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
framework:
2+
fragments:
3+
enabled: false
4+
esi:
5+
enabled: true
6+
ssi:
7+
enabled: true

‎Tests/DependencyInjection/Fixtures/yml/esi_disabled.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
framework:
2+
esi:
3+
enabled: false

‎Tests/DependencyInjection/Fixtures/yml/ssi_disabled.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
framework:
2+
ssi:
3+
enabled: false

0 commit comments

Comments
 (0)