diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #25510 [FrameworkBundle] fix merge of 3.3 into 3.4 (dmaicher)

Browse Source 
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 https://github.com/symfony/symfony/pull/25489 up from 2.7

This just cleans up the duplication.

Commits
-------

76e16ff [FrameworkBundle] fix merge of 3.3 into 3.4
This commit is contained in:
Nicolas Grekas 2017-12-15 11:37:36 +01:00
commit 77104a1468
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View File

@ -141,13 +141,6 @@ abstract class FrameworkExtensionTest extends TestCase
$container = $this->createContainerFromFile('esi_disabled');
$this->assertFalse($container->hasDefinition('fragment.renderer.esi'), 'The ESI fragment renderer is not registered');
}
public function testEsiInactive()
{
$container = $this->createContainerFromFile('default_config');
$this->assertFalse($container->hasDefinition('fragment.renderer.esi'));
$this->assertFalse($container->hasDefinition('esi'));
}
@ -164,6 +157,7 @@ abstract class FrameworkExtensionTest extends TestCase
$container = $this->createContainerFromFile('ssi_disabled');
$this->assertFalse($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is not registered');
$this->assertFalse($container->hasDefinition('ssi'));
}
public function testEsiAndSsiWithoutFragments()
@ -175,14 +169,6 @@ abstract class FrameworkExtensionTest extends TestCase
$this->assertTrue($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is registered');
}
public function testSsiInactive()
{
$container = $this->createContainerFromFile('default_config');
$this->assertFalse($container->hasDefinition('fragment.renderer.ssi'));
$this->assertFalse($container->hasDefinition('ssi'));
}
public function testEnabledProfiler()
{
$container = $this->createContainerFromFile('profiler');