Skip to content

Commit 77104a1

Browse files
minor symfony#25510 [FrameworkBundle] fix merge of 3.3 into 3.4 (dmaicher)
This PR was merged into the 3.4 branch. Discussion ---------- [FrameworkBundle] fix merge of 3.3 into 3.4 | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - In 3.4+ there were tests for disabled esi/ssi already so now they have been duplicated by merging symfony#25489 up from 2.7 This just cleans up the duplication. Commits ------- 76e16ff [FrameworkBundle] fix merge of 3.3 into 3.4
2 parents 60ddf9e + 76e16ff commit 77104a1

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,6 @@ public function testEsiDisabled()
141141
$container = $this->createContainerFromFile('esi_disabled');
142142

143143
$this->assertFalse($container->hasDefinition('fragment.renderer.esi'), 'The ESI fragment renderer is not registered');
144-
}
145-
146-
public function testEsiInactive()
147-
{
148-
$container = $this->createContainerFromFile('default_config');
149-
150-
$this->assertFalse($container->hasDefinition('fragment.renderer.esi'));
151144
$this->assertFalse($container->hasDefinition('esi'));
152145
}
153146

@@ -164,6 +157,7 @@ public function testSsiDisabled()
164157
$container = $this->createContainerFromFile('ssi_disabled');
165158

166159
$this->assertFalse($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is not registered');
160+
$this->assertFalse($container->hasDefinition('ssi'));
167161
}
168162

169163
public function testEsiAndSsiWithoutFragments()
@@ -175,14 +169,6 @@ public function testEsiAndSsiWithoutFragments()
175169
$this->assertTrue($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is registered');
176170
}
177171

178-
public function testSsiInactive()
179-
{
180-
$container = $this->createContainerFromFile('default_config');
181-
182-
$this->assertFalse($container->hasDefinition('fragment.renderer.ssi'));
183-
$this->assertFalse($container->hasDefinition('ssi'));
184-
}
185-
186172
public function testEnabledProfiler()
187173
{
188174
$container = $this->createContainerFromFile('profiler');

0 commit comments

Comments
 (0)