Favor TreeBuilder::getRootNode

chrisguitarguy · chrisguitarguy · commit 2d75b9c026dd · 2021-04-29T09:01:57.000-05:00
So the bundle doesn't produce notices about `root` being deprecated.

Also changed the call to `root` so it passes `treeType` as it does a few
lines up. Seems like calling `root` replaces the root node so the
AWS_MERGE_CONFIG thing might have been subtle broken in older symfony
versions?
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -31,10 +31,10 @@ public function getConfigTreeBuilder()
             return $treeBuilder;
         }
 
-        if (method_exists($treeBuilder, 'root')) {
-            $rootNode = $treeBuilder->root('aws');
-        } else {
+        if (method_exists($treeBuilder, 'getRootNode')) {
             $rootNode = $treeBuilder->getRootNode();
+        } else {
+            $rootNode = $treeBuilder->root('aws', $treeType);
         }
 
         // Define TreeBuilder to allow config validation and merging

Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,10 @@ public function getConfigTreeBuilder()`
`31`	`31`	`return $treeBuilder;`
`32`	`32`	`}`
`33`	`33`
`34`		`- if (method_exists($treeBuilder, 'root')) {`
`35`		`- $rootNode = $treeBuilder->root('aws');`
`36`		`- } else {`
	`34`	`+ if (method_exists($treeBuilder, 'getRootNode')) {`
`37`	`35`	`$rootNode = $treeBuilder->getRootNode();`
	`36`	`+ } else {`
	`37`	`+ $rootNode = $treeBuilder->root('aws', $treeType);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`// Define TreeBuilder to allow config validation and merging`