Skip to content

Commit

Permalink
Merge branch '4.3' into 4.4
Browse files Browse the repository at this point in the history
* 4.3:
  [Serializer] add missing "internal" annotation
  [DI] Fix suspicious test
  [SecurityBundle] add missing contraint for symfony/config dep
  • Loading branch information
nicolas-grekas committed Jun 8, 2019
2 parents f167454 + dba180c commit 1647255
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions Tests/Compiler/ValidateEnvPlaceholdersPassTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -278,16 +278,15 @@ public function testEnvWithVariableNode(): void

/**
* @group legacy
* @expectedDeprecation A tree builder without a root node is deprecated since Symfony 4.2 and will not be supported anymore in 5.0.
*/
public function testConfigurationWithoutRootNode(): void
{
$container = new ContainerBuilder();
$container->registerExtension(new EnvExtension(new EnvConfigurationWithoutRootNode()));
$container->loadFromExtension('env_extension');
$container->loadFromExtension('env_extension', ['foo' => 'bar']);

$this->doProcess($container);

$this->addToAssertionCount(1);
(new ValidateEnvPlaceholdersPass())->process($container);
}

public function testEmptyConfigFromMoreThanOneSource()
Expand Down Expand Up @@ -392,7 +391,7 @@ class EnvConfigurationWithoutRootNode implements ConfigurationInterface
{
public function getConfigTreeBuilder()
{
return new TreeBuilder('env_extension');
return new TreeBuilder();
}
}

Expand Down

0 comments on commit 1647255

Please sign in to comment.