From 5045fbeeec82b5bc59f1b8e5f5c1b7a304bdc272 Mon Sep 17 00:00:00 2001 From: Xavier HAUSHERR Date: Tue, 11 Dec 2018 14:08:55 +0100 Subject: [PATCH 1/6] Fix another SF 4.2 deprecation --- DependencyInjection/Configuration.php | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index b2c24b96..3943b0c0 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -45,10 +45,9 @@ public function __construct($debug) */ public function getConfigTreeBuilder() { - $treeBuilder = new TreeBuilder(); - $rootNode = $treeBuilder->root('bazinga_geocoder'); + $treeBuilder = new TreeBuilder('bazinga_geocoder'); - $rootNode + $treeBuilder->getRootNode() ->children() ->append($this->getProvidersNode()) ->arrayNode('profiling') @@ -85,10 +84,9 @@ public function getConfigTreeBuilder() */ private function getProvidersNode() { - $treeBuilder = new TreeBuilder(); - $node = $treeBuilder->root('providers'); + $treeBuilder = new TreeBuilder('providers'); - $node + return $treeBuilder->getRootNode() ->requiresAtLeastOneElement() ->useAttributeAsKey('name') ->prototype('array') @@ -111,8 +109,6 @@ private function getProvidersNode() ->append($this->createClientPluginNode()) ->end() ->end(); - - return $node; } /** @@ -122,8 +118,8 @@ private function getProvidersNode() */ private function createClientPluginNode() { - $builder = new TreeBuilder(); - $node = $builder->root('plugins'); + $builder = new TreeBuilder('plugins'); + $node = $builder->getRootNode(); /** @var ArrayNodeDefinition $pluginList */ $pluginList = $node From 1c8ca1f1acd26246b0295975e701b98290c175a4 Mon Sep 17 00:00:00 2001 From: Xavier HAUSHERR Date: Tue, 18 Dec 2018 13:50:11 +0100 Subject: [PATCH 2/6] Fix another SF 4.2 deprecation --- DependencyInjection/Configuration.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 3943b0c0..4b1e6707 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -37,6 +37,15 @@ public function __construct($debug) { $this->debug = (bool) $debug; } + + protected function getRootNode(TreeBuilder $treeBuilder, string $name) + { + if (\method_exists($treeBuilder, 'getRootNode')) { + return $treeBuilder->getRootNode(); + } else { + return $treeBuilder->root($name); + } + } /** * Generates the configuration tree builder. @@ -47,7 +56,7 @@ public function getConfigTreeBuilder() { $treeBuilder = new TreeBuilder('bazinga_geocoder'); - $treeBuilder->getRootNode() + $this->getRootNode($treeBuilder, 'bazinga_geocoder') ->children() ->append($this->getProvidersNode()) ->arrayNode('profiling') @@ -86,7 +95,7 @@ private function getProvidersNode() { $treeBuilder = new TreeBuilder('providers'); - return $treeBuilder->getRootNode() + return $this->getRootNode($treeBuilder, 'providers') ->requiresAtLeastOneElement() ->useAttributeAsKey('name') ->prototype('array') @@ -119,7 +128,7 @@ private function getProvidersNode() private function createClientPluginNode() { $builder = new TreeBuilder('plugins'); - $node = $builder->getRootNode(); + $node = $this->getRootNode($builder, 'plugins'); /** @var ArrayNodeDefinition $pluginList */ $pluginList = $node From df8d60bddd47a51b21a0bfce4a5c17be496bbf31 Mon Sep 17 00:00:00 2001 From: Xavier HAUSHERR Date: Tue, 18 Dec 2018 13:51:36 +0100 Subject: [PATCH 3/6] Add phpdoc --- DependencyInjection/Configuration.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 4b1e6707..3916796f 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -38,6 +38,11 @@ public function __construct($debug) $this->debug = (bool) $debug; } + /** + * Proxy to get root node for Symfony < 4.2 + * @param TreeBuilder $treeBuilder + * @param string $name + */ protected function getRootNode(TreeBuilder $treeBuilder, string $name) { if (\method_exists($treeBuilder, 'getRootNode')) { From 74fae2736fe5ba2d6d0a834277cb389ba00d61b9 Mon Sep 17 00:00:00 2001 From: Xavier HAUSHERR Date: Tue, 18 Dec 2018 13:54:16 +0100 Subject: [PATCH 4/6] Fix PHPCS --- DependencyInjection/Configuration.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 3916796f..e23b2e5f 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -39,17 +39,18 @@ public function __construct($debug) } /** - * Proxy to get root node for Symfony < 4.2 - * @param TreeBuilder $treeBuilder - * @param string $name + * Proxy to get root node for Symfony < 4.2. + * @param TreeBuilder $treeBuilder + * @param string $name + * @return NodeDefinition */ protected function getRootNode(TreeBuilder $treeBuilder, string $name) { if (\method_exists($treeBuilder, 'getRootNode')) { - return $treeBuilder->getRootNode(); - } else { - return $treeBuilder->root($name); - } + return $treeBuilder->getRootNode(); + } else { + return $treeBuilder->root($name); + } } /** From 9e147dcdbf6ec5b58cc6c69c513249fbbb311130 Mon Sep 17 00:00:00 2001 From: Xavier HAUSHERR Date: Tue, 18 Dec 2018 13:55:10 +0100 Subject: [PATCH 5/6] Fix PHPCS --- DependencyInjection/Configuration.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index e23b2e5f..2f4b5128 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -37,11 +37,11 @@ public function __construct($debug) { $this->debug = (bool) $debug; } - + /** * Proxy to get root node for Symfony < 4.2. - * @param TreeBuilder $treeBuilder - * @param string $name + * @param TreeBuilder $treeBuilder + * @param string $name * @return NodeDefinition */ protected function getRootNode(TreeBuilder $treeBuilder, string $name) From 9c1786cf8389ba14a35661eb07653fbff9d07f8f Mon Sep 17 00:00:00 2001 From: Xavier HAUSHERR Date: Tue, 18 Dec 2018 13:55:43 +0100 Subject: [PATCH 6/6] Update Configuration.php --- DependencyInjection/Configuration.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 2f4b5128..fe65d440 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -40,8 +40,10 @@ public function __construct($debug) /** * Proxy to get root node for Symfony < 4.2. + * * @param TreeBuilder $treeBuilder * @param string $name + * * @return NodeDefinition */ protected function getRootNode(TreeBuilder $treeBuilder, string $name)