minor #31944 [DI] Fix suspicious test (ro0NL)

nicolas-grekas · nicolas-grekas · commit 13e5773132ff · 2019-06-08T08:03:01.000+02:00
This PR was merged into the 4.2 branch. Discussion ---------- [DI] Fix suspicious test | Q | A | ------------- | --- | Branch? | 4.2 | Bug fix? | yes | New feature? | no | BC breaks? | no  | Deprecations? | no | Tests pass? | yes  | Fixed tickets | #31942 | License | MIT | Doc PR | symfony/symfony-docs#...  cc @nicolas-grekas Commits ------- 25b961a [DI] Fix suspicious test
diff --git a/src/Symfony/Component/Config/Definition/Exception/TreeWithoutRootNodeException.php b/src/Symfony/Component/Config/Definition/Exception/TreeWithoutRootNodeException.php
@@ -13,6 +13,8 @@
 
 /**
  * @author Roland Franssen <franssen.roland@gmail.com>
+ *
+ * @internal
  */
 class TreeWithoutRootNodeException extends \RuntimeException
 {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php
@@ -226,16 +226,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()
@@ -332,7 +331,7 @@ class EnvConfigurationWithoutRootNode implements ConfigurationInterface
 {
     public function getConfigTreeBuilder()
     {
-        return new TreeBuilder('env_extension');
+        return new TreeBuilder();
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* @author Roland Franssen <[email protected]>`
	`16`	`+ *`
	`17`	`+ * @internal`
`16`	`18`	`*/`
`17`	`19`	`class TreeWithoutRootNodeException extends \RuntimeException`
`18`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -226,16 +226,15 @@ public function testEnvWithVariableNode(): void`
`226`	`226`
`227`	`227`	`/**`
`228`	`228`	`* @group legacy`
	`229`	`+ * @expectedDeprecation A tree builder without a root node is deprecated since Symfony 4.2 and will not be supported anymore in 5.0.`
`229`	`230`	`*/`
`230`	`231`	`public function testConfigurationWithoutRootNode(): void`
`231`	`232`	`{`
`232`	`233`	`$container = new ContainerBuilder();`
`233`	`234`	`$container->registerExtension(new EnvExtension(new EnvConfigurationWithoutRootNode()));`
`234`		`- $container->loadFromExtension('env_extension');`
	`235`	`+ $container->loadFromExtension('env_extension', ['foo' => 'bar']);`
`235`	`236`
`236`		`- $this->doProcess($container);`
`237`		`-`
`238`		`- $this->addToAssertionCount(1);`
	`237`	`+ (new ValidateEnvPlaceholdersPass())->process($container);`
`239`	`238`	`}`
`240`	`239`
`241`	`240`	`public function testEmptyConfigFromMoreThanOneSource()`
`@@ -332,7 +331,7 @@ class EnvConfigurationWithoutRootNode implements ConfigurationInterface`
`332`	`331`	`{`
`333`	`332`	`public function getConfigTreeBuilder()`
`334`	`333`	`{`
`335`		`- return new TreeBuilder('env_extension');`
	`334`	`+ return new TreeBuilder();`
`336`	`335`	`}`
`337`	`336`	`}`
`338`	`337`