From fddf9bca673974076e14e7f7cff19282770ee703 Mon Sep 17 00:00:00 2001 From: Olivier Dolbeau Date: Tue, 4 Dec 2018 23:59:14 +0100 Subject: [PATCH 1/2] Avoid deprecated notice when using symfony/config > 4.2 --- DependencyInjection/Configuration.php | 37 +++++++++++++++++++++------ 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 6a1a36fc..3e898067 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -49,8 +49,13 @@ public function __construct($debug) */ public function getConfigTreeBuilder() { - $treeBuilder = new TreeBuilder(); - $rootNode = $treeBuilder->root('httplug'); + $treeBuilder = new TreeBuilder('httplug'); + // Keep compatibility with symfony/config < 4.2 + if (!method_exists($treeBuilder, 'getRootNode')) { + $rootNode = $treeBuilder->root('httplug'); + } else { + $rootNode = $treeBuilder->getRootNode(); + } $this->configureClients($rootNode); $this->configureSharedPlugins($rootNode); @@ -240,8 +245,13 @@ private function configureSharedPlugins(ArrayNodeDefinition $root) */ private function createClientPluginNode() { - $builder = new TreeBuilder(); - $node = $builder->root('plugins'); + $treeBuilder = new TreeBuilder('plugins'); + // Keep compatibility with symfony/config < 4.2 + if (!method_exists($treeBuilder, 'getRootNode')) { + $node = $treeBuilder->root('plugins'); + } else { + $node = $treeBuilder->getRootNode(); + } /** @var ArrayNodeDefinition $pluginList */ $pluginList = $node @@ -514,8 +524,14 @@ private function addSharedPluginNodes(ArrayNodeDefinition $pluginNode, $disableA */ private function createAuthenticationPluginNode() { - $builder = new TreeBuilder(); - $node = $builder->root('authentication'); + $treeBuilder = new TreeBuilder('authentication'); + // Keep compatibility with symfony/config < 4.2 + if (!method_exists($treeBuilder, 'getRootNode')) { + $node = $treeBuilder->root('authentication'); + } else { + $node = $treeBuilder->getRootNode(); + } + $node ->useAttributeAsKey('name') ->prototype('array') @@ -605,9 +621,14 @@ private function validateAuthenticationType(array $expected, array $actual, $aut */ private function createCachePluginNode() { - $builder = new TreeBuilder(); + $builder = new TreeBuilder('config'); + // Keep compatibility with symfony/config < 4.2 + if (!method_exists($builder, 'getRootNode')) { + $config = $builder->root('config'); + } else { + $config = $builder->getRootNode(); + } - $config = $builder->root('config'); $config ->fixXmlConfig('method') ->fixXmlConfig('respect_response_cache_directive') From 40e86577d1df74944a3ad7e63a1e25a310bf231b Mon Sep 17 00:00:00 2001 From: Olivier Dolbeau Date: Wed, 5 Dec 2018 00:02:59 +0100 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae25dedc..3a107f9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release. +## Unreleased + +### Fixed + +- Fix deprecated notice when using symfony/config > 4.2 + ## 1.13.1 - 2018-11-28 ### Fixed