Skip to content
This repository was archived by the owner on Oct 29, 2020. It is now read-only.

Remove a TreeBuilder deprecation #143

Closed
wants to merge 2 commits into from
Closed

Remove a TreeBuilder deprecation #143

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bc7d44
Remove a TreeBuilder deprecation
javiereguiluz Oct 11, 2018
698a161
Added a BC layer inspired by the DoctrineBundle one
javiereguiluz Oct 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 38 additions & 28 deletions DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ public function isCustomProvider($type, NodeInterface $tree)
public function getConfigTreeBuilder()
{
$self = $this;
$builder = new TreeBuilder();
$node = $builder->root('doctrine_cache', 'array');
$builder = new TreeBuilder('doctrine_cache');
$node = $builder->getRootNode($builder, 'doctrine_cache');
$normalization = function ($conf) use ($self, $builder) {
$conf['type'] = isset($conf['type'])
? $conf['type']
Expand Down Expand Up @@ -198,8 +198,8 @@ public function getConfigTreeBuilder()
*/
private function addBasicProviderNode($name)
{
$builder = new TreeBuilder();
$node = $builder->root($name);
$builder = new TreeBuilder($name);
$node = $builder->getRootNode($builder, $name);

return $node;
}
Expand All @@ -211,8 +211,8 @@ private function addBasicProviderNode($name)
*/
private function addCustomProviderNode()
{
$builder = new TreeBuilder();
$node = $builder->root('custom_provider');
$builder = new TreeBuilder('custom_provider');
$node = $builder->getRootNode($builder, 'custom_provider');

$node
->children()
Expand All @@ -234,8 +234,8 @@ private function addCustomProviderNode()
*/
private function addChainNode()
{
$builder = new TreeBuilder();
$node = $builder->root('chain');
$builder = new TreeBuilder('chain');
$node = $builder->getRootNode($builder, 'chain');

$node
->fixXmlConfig('provider')
Expand All @@ -256,8 +256,8 @@ private function addChainNode()
*/
private function addMemcacheNode()
{
$builder = new TreeBuilder();
$node = $builder->root('memcache');
$builder = new TreeBuilder('memcache');
$node = $builder->getRootNode($builder, 'memcache');
$host = '%doctrine_cache.memcache.host%';
$port = '%doctrine_cache.memcache.port%';

Expand Down Expand Up @@ -301,8 +301,8 @@ private function addMemcacheNode()
*/
private function addMemcachedNode()
{
$builder = new TreeBuilder();
$node = $builder->root('memcached');
$builder = new TreeBuilder('memcached');
$node = $builder->getRootNode($builder, 'memcached');
$host = '%doctrine_cache.memcached.host%';
$port = '%doctrine_cache.memcached.port%';

Expand Down Expand Up @@ -347,8 +347,8 @@ private function addMemcachedNode()
*/
private function addRedisNode()
{
$builder = new TreeBuilder();
$node = $builder->root('redis');
$builder = new TreeBuilder('redis');
$node = $builder->getRootNode($builder, 'redis');

$node
->addDefaultsIfNotSet()
Expand All @@ -373,8 +373,8 @@ private function addRedisNode()
*/
private function addPredisNode()
{
$builder = new TreeBuilder();
$node = $builder->root('predis');
$builder = new TreeBuilder('predis');
$node = $builder->getRootNode($builder, 'predis');

$node
->addDefaultsIfNotSet()
Expand Down Expand Up @@ -403,8 +403,8 @@ private function addPredisNode()
*/
private function addRiakNode()
{
$builder = new TreeBuilder();
$node = $builder->root('riak');
$builder = new TreeBuilder('riak');
$node = $builder->getRootNode($builder, 'riak');

$node
->addDefaultsIfNotSet()
Expand Down Expand Up @@ -433,8 +433,8 @@ private function addRiakNode()
*/
private function addCouchbaseNode()
{
$builder = new TreeBuilder();
$node = $builder->root('couchbase');
$builder = new TreeBuilder('couchbase');
$node = $builder->getRootNode($builder, 'couchbase');

$node
->addDefaultsIfNotSet()
Expand All @@ -461,8 +461,8 @@ private function addCouchbaseNode()
*/
private function addMongoNode()
{
$builder = new TreeBuilder();
$node = $builder->root('mongodb');
$builder = new TreeBuilder('mongodb');
$node = $builder->getRootNode($builder, 'mongodb');

$node
->addDefaultsIfNotSet()
Expand All @@ -485,8 +485,8 @@ private function addMongoNode()
*/
private function addPhpFileNode()
{
$builder = new TreeBuilder();
$node = $builder->root('php_file');
$builder = new TreeBuilder('php_file');
$node = $builder->getRootNode($builder, 'php_file');

$node
->addDefaultsIfNotSet()
Expand All @@ -507,8 +507,8 @@ private function addPhpFileNode()
*/
private function addFileSystemNode()
{
$builder = new TreeBuilder();
$node = $builder->root('file_system');
$builder = new TreeBuilder('file_system');
$node = $builder->getRootNode($builder, 'file_system');

$node
->addDefaultsIfNotSet()
Expand All @@ -529,8 +529,8 @@ private function addFileSystemNode()
*/
private function addSqlite3Node()
{
$builder = new TreeBuilder();
$node = $builder->root('sqlite3');
$builder = new TreeBuilder('sqlite3');
$node = $builder->getRootNode($builder, 'sqlite3');

$node
->addDefaultsIfNotSet()
Expand All @@ -543,4 +543,14 @@ private function addSqlite3Node()

return $node;
}

private function getRootNode(TreeBuilder $treeBuilder, $name)
{
// BC layer for symfony/config 4.1 and older
if (! \method_exists($treeBuilder, 'getRootNode')) {
return $treeBuilder->root($name);
}

return $treeBuilder->getRootNode();
}
}