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

Merge branch '4.2' into 4.3

Browse Source 
* 4.2:
  [DI] Fix suspicious test
  [SecurityBundle] add missing contraint for symfony/config dep
This commit is contained in:
Nicolas Grekas 2019-06-08 08:33:08 +02:00
commit b5306d2e81
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Config/Definition/Exception/TreeWithoutRootNodeException.php
View File

@ -13,6 +13,8 @@ namespace Symfony\Component\Config\Definition\Exception;
/** /**
* @author Roland Franssen <franssen.roland@gmail.com> * @author Roland Franssen <franssen.roland@gmail.com>
*
* @internal
*/ */
class TreeWithoutRootNodeException extends \RuntimeException class TreeWithoutRootNodeException extends \RuntimeException
{ {

9
src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php
View File

@ -278,16 +278,15 @@ class ValidateEnvPlaceholdersPassTest extends TestCase
/** /**
* @group legacy * @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 public function testConfigurationWithoutRootNode(): void
{ {
$container = new ContainerBuilder(); $container = new ContainerBuilder();
$container->registerExtension(new EnvExtension(new EnvConfigurationWithoutRootNode())); $container->registerExtension(new EnvExtension(new EnvConfigurationWithoutRootNode()));
$container->loadFromExtension('env_extension'); $container->loadFromExtension('env_extension', ['foo' => 'bar']);
$this->doProcess($container); (new ValidateEnvPlaceholdersPass())->process($container);
$this->addToAssertionCount(1);
} }
public function testEmptyConfigFromMoreThanOneSource() public function testEmptyConfigFromMoreThanOneSource()
@ -392,7 +391,7 @@ class EnvConfigurationWithoutRootNode implements ConfigurationInterface
{ {
public function getConfigTreeBuilder() public function getConfigTreeBuilder()
{ {
return new TreeBuilder('env_extension'); return new TreeBuilder();
} }
} }