Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit e8975e2dfeb9 · 2019-06-08T08:36:25.000+02:00
* 4.3:
  [Serializer] add missing "internal" annotation
  [DI] Fix suspicious test
  [SecurityBundle] add missing contraint for symfony/config dep
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
@@ -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()
@@ -392,7 +391,7 @@ class EnvConfigurationWithoutRootNode implements ConfigurationInterface
 {
     public function getConfigTreeBuilder()
     {
-        return new TreeBuilder('env_extension');
+        return new TreeBuilder();
     }
 }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -561,6 +561,8 @@ private function isMaxDepthReached(array $attributesMetadata, string $class, str
      * {@inheritdoc}
      *
      * @param string|null $format
+     *
+     * @internal
      */
     protected function createChildContext(array $parentContext, $attribute/*, ?string $format */)
     {

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* @author Roland Franssen <franssen.roland@gmail.com>`
	`16`	`+ *`
	`17`	`+ * @internal`
`16`	`18`	`*/`
`17`	`19`	`class TreeWithoutRootNodeException extends \RuntimeException`
`18`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -278,16 +278,15 @@ public function testEnvWithVariableNode(): void`
`278`	`278`
`279`	`279`	`/**`
`280`	`280`	`* @group legacy`
	`281`	`+ * @expectedDeprecation A tree builder without a root node is deprecated since Symfony 4.2 and will not be supported anymore in 5.0.`
`281`	`282`	`*/`
`282`	`283`	`public function testConfigurationWithoutRootNode(): void`
`283`	`284`	`{`
`284`	`285`	`$container = new ContainerBuilder();`
`285`	`286`	`$container->registerExtension(new EnvExtension(new EnvConfigurationWithoutRootNode()));`
`286`		`- $container->loadFromExtension('env_extension');`
	`287`	`+ $container->loadFromExtension('env_extension', ['foo' => 'bar']);`
`287`	`288`
`288`		`- $this->doProcess($container);`
`289`		`-`
`290`		`- $this->addToAssertionCount(1);`
	`289`	`+ (new ValidateEnvPlaceholdersPass())->process($container);`
`291`	`290`	`}`
`292`	`291`
`293`	`292`	`public function testEmptyConfigFromMoreThanOneSource()`
`@@ -392,7 +391,7 @@ class EnvConfigurationWithoutRootNode implements ConfigurationInterface`
`392`	`391`	`{`
`393`	`392`	`public function getConfigTreeBuilder()`
`394`	`393`	`{`
`395`		`- return new TreeBuilder('env_extension');`
	`394`	`+ return new TreeBuilder();`
`396`	`395`	`}`
`397`	`396`	`}`
`398`	`397`
Original file line number	Diff line number	Diff line change
`@@ -561,6 +561,8 @@ private function isMaxDepthReached(array $attributesMetadata, string $class, str`
`561`	`561`	`* {@inheritdoc}`
`562`	`562`	`*`
`563`	`563`	`* @param string\|null $format`
	`564`	`+ *`
	`565`	`+ * @internal`
`564`	`566`	`*/`
`565`	`567`	`protected function createChildContext(array $parentContext, $attribute/, ?string $format /)`
`566`	`568`	`{`