Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[FrameworkBundle] fix merge of 3.3 into 3.4 #25510

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 15, 2017
Merged

[FrameworkBundle] fix merge of 3.3 into 3.4 #25510

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] fix merge of 3.3 into 3.4
  • Loading branch information
@dmaicher
dmaicher committed Dec 15, 2017
commit 76e16ff4ef5144103835cebdbc06d14df866bfeb
16 changes: 1 addition & 15 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,6 @@ public function testEsiDisabled()
$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'));
}

Expand All @@ -164,6 +157,7 @@ public function testSsiDisabled()
$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()
Expand All @@ -175,14 +169,6 @@ public function testEsiAndSsiWithoutFragments()
$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');
Expand Down