Skip to content

Commit 480b7fa

Browse files
authored
Merge pull request #290 from odolbeau/avoid-deprecated-calls
Avoid deprecated notice when using symfony/config > 4.2
2 parents 5da24de + 40e8657 commit 480b7fa

File tree

2 files changed

+35
-8
lines changed

2 files changed

+35
-8
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
44

5+
## Unreleased
6+
7+
### Fixed
8+
9+
- Fix deprecated notice when using symfony/config > 4.2
10+
511
## 1.13.1 - 2018-11-28
612

713
### Fixed

DependencyInjection/Configuration.php

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,13 @@ public function __construct($debug)
4949
*/
5050
public function getConfigTreeBuilder()
5151
{
52-
$treeBuilder = new TreeBuilder();
53-
$rootNode = $treeBuilder->root('httplug');
52+
$treeBuilder = new TreeBuilder('httplug');
53+
// Keep compatibility with symfony/config < 4.2
54+
if (!method_exists($treeBuilder, 'getRootNode')) {
55+
$rootNode = $treeBuilder->root('httplug');
56+
} else {
57+
$rootNode = $treeBuilder->getRootNode();
58+
}
5459

5560
$this->configureClients($rootNode);
5661
$this->configureSharedPlugins($rootNode);
@@ -240,8 +245,13 @@ private function configureSharedPlugins(ArrayNodeDefinition $root)
240245
*/
241246
private function createClientPluginNode()
242247
{
243-
$builder = new TreeBuilder();
244-
$node = $builder->root('plugins');
248+
$treeBuilder = new TreeBuilder('plugins');
249+
// Keep compatibility with symfony/config < 4.2
250+
if (!method_exists($treeBuilder, 'getRootNode')) {
251+
$node = $treeBuilder->root('plugins');
252+
} else {
253+
$node = $treeBuilder->getRootNode();
254+
}
245255

246256
/** @var ArrayNodeDefinition $pluginList */
247257
$pluginList = $node
@@ -514,8 +524,14 @@ private function addSharedPluginNodes(ArrayNodeDefinition $pluginNode, $disableA
514524
*/
515525
private function createAuthenticationPluginNode()
516526
{
517-
$builder = new TreeBuilder();
518-
$node = $builder->root('authentication');
527+
$treeBuilder = new TreeBuilder('authentication');
528+
// Keep compatibility with symfony/config < 4.2
529+
if (!method_exists($treeBuilder, 'getRootNode')) {
530+
$node = $treeBuilder->root('authentication');
531+
} else {
532+
$node = $treeBuilder->getRootNode();
533+
}
534+
519535
$node
520536
->useAttributeAsKey('name')
521537
->prototype('array')
@@ -605,9 +621,14 @@ private function validateAuthenticationType(array $expected, array $actual, $aut
605621
*/
606622
private function createCachePluginNode()
607623
{
608-
$builder = new TreeBuilder();
624+
$builder = new TreeBuilder('config');
625+
// Keep compatibility with symfony/config < 4.2
626+
if (!method_exists($builder, 'getRootNode')) {
627+
$config = $builder->root('config');
628+
} else {
629+
$config = $builder->getRootNode();
630+
}
609631

610-
$config = $builder->root('config');
611632
$config
612633
->fixXmlConfig('method')
613634
->fixXmlConfig('respect_response_cache_directive')

0 commit comments

Comments
 (0)