Deprecate TreeBuilder::root

gharlan · gharlan · commit 8f2420003073 · 2019-04-09T01:07:36.000+02:00
diff --git a/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php
@@ -29,7 +29,8 @@ public function __construct(string $name = null, string $type = 'array', NodeBui
         if (null === $name) {
             @trigger_error('A tree builder without a root node is deprecated since Symfony 4.2 and will not be supported anymore in 5.0.', E_USER_DEPRECATED);
         } else {
-            $this->root($name, $type, $builder);
+            $builder = $builder ?: new NodeBuilder();
+            $this->root = $builder->node($name, $type)->setParent($this);
         }
     }
 
@@ -43,9 +44,13 @@ public function __construct(string $name = null, string $type = 'array', NodeBui
      * @return ArrayNodeDefinition|NodeDefinition The root node (as an ArrayNodeDefinition when the type is 'array')
      *
      * @throws \RuntimeException When the node type is not supported
+     *
+     * @deprecated since Symfony 4.3, pass the root name to the constructor instead
      */
     public function root($name, $type = 'array', NodeBuilder $builder = null)
     {
+        @trigger_error(sprintf('The "%s()" method (called for "%s") is deprecated since Symfony 4.3, pass the root name to the constructor instead.', __METHOD__, $name), E_USER_DEPRECATED);
+
         $builder = $builder ?: new NodeBuilder();
 
         return $this->root = $builder->node($name, $type)->setParent($this);

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,8 @@ public function __construct(string $name = null, string $type = 'array', NodeBui`
`29`	`29`	`if (null === $name) {`
`30`	`30`	`@trigger_error('A tree builder without a root node is deprecated since Symfony 4.2 and will not be supported anymore in 5.0.', E_USER_DEPRECATED);`
`31`	`31`	`} else {`
`32`		`- $this->root($name, $type, $builder);`
	`32`	`+ $builder = $builder ?: new NodeBuilder();`
	`33`	`+ $this->root = $builder->node($name, $type)->setParent($this);`
`33`	`34`	`}`
`34`	`35`	`}`
`35`	`36`
`@@ -43,9 +44,13 @@ public function __construct(string $name = null, string $type = 'array', NodeBui`
`43`	`44`	`* @return ArrayNodeDefinition\|NodeDefinition The root node (as an ArrayNodeDefinition when the type is 'array')`
`44`	`45`	`*`
`45`	`46`	`* @throws \RuntimeException When the node type is not supported`
	`47`	`+ *`
	`48`	`+ * @deprecated since Symfony 4.3, pass the root name to the constructor instead`
`46`	`49`	`*/`
`47`	`50`	`public function root($name, $type = 'array', NodeBuilder $builder = null)`
`48`	`51`	`{`
	`52`	`+ @trigger_error(sprintf('The "%s()" method (called for "%s") is deprecated since Symfony 4.3, pass the root name to the constructor instead.', __METHOD__, $name), E_USER_DEPRECATED);`
	`53`	`+`
`49`	`54`	`$builder = $builder ?: new NodeBuilder();`
`50`	`55`
`51`	`56`	`return $this->root = $builder->node($name, $type)->setParent($this);`