1e0ed22c55
The Config component API have changed and the extension configuration files must be updated accordingly:
1. Array nodes must enclosed their children definition in ->children() ... ->end() calls:
Before:
$treeBuilder->root('zend', 'array')
->arrayNode('logger')
->scalarNode('priority')->defaultValue('INFO')->end()
->booleanNode('log_errors')->defaultFalse()->end()
->end();
After:
$treeBuilder->root('zend', 'array')
->children()
->arrayNode('logger')
->children()
->scalarNode('priority')->defaultValue('INFO')->end()
->booleanNode('log_errors')->defaultFalse()->end()
->end()
->end()
->end();
2. The 'builder' method (in NodeBuilder) has been dropped in favor of an 'append' method (in ArrayNodeDefinition)
Before:
$treeBuilder->root('doctrine', 'array')
->arrayNode('dbal')
->builder($this->getDbalConnectionsNode())
->end();
After:
$treeBuilder->root('doctrine', 'array')
->children()
->arrayNode('dbal')
->append($this->getDbalConnectionsNode())
->end()
->end();
3. The root of a TreeBuilder is now an NodeDefinition (and most probably an ArrayNodeDefinition):
Before:
$root = $treeBuilder->root('doctrine', 'array');
$this->addDbalSection($root);
public function addDbalSection(NodeBuilder $node)
{
...
}
After:
$root = $treeBuilder->root('doctrine', 'array');
$this->addDbalSection($root);
public function addDbalSection(ArrayNodeDefinition $node)
{
...
}
4. The NodeBuilder API has changed (this is seldom used):
Before:
$node = new NodeBuilder('connections', 'array');
After:
The recommended way is to use a tree builder:
$treeBuilder = new TreeBuilder();
$node = $treeBuilder->root('connections', 'array');
An other way would be:
$builder = new NodeBuilder();
$node = $builder->node('connections', 'array');
Some notes:
- Tree root nodes should most always be array nodes, so this as been made the default:
$treeBuilder->root('doctrine', 'array') is equivalent to $treeBuilder->root('doctrine')
- There could be more than one ->children() ... ->end() sections. This could help with the readability:
$treeBuilder->root('doctrine')
->children()
->scalarNode('default_connection')->end()
->end()
->fixXmlConfig('type')
->children()
->arrayNode('types')
....
->end()
->end()
135 lines
3.7 KiB
PHP
135 lines
3.7 KiB
PHP
<?php
|
|
|
|
namespace Symfony\Tests\Component\Config\Definition;
|
|
|
|
use Symfony\Component\Config\Definition\NodeInterface;
|
|
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
|
|
|
|
class NormalizerTest extends \PHPUnit_Framework_TestCase
|
|
{
|
|
/**
|
|
* @dataProvider getEncoderTests
|
|
*/
|
|
public function testNormalizeEncoders($denormalized)
|
|
{
|
|
$tb = new TreeBuilder();
|
|
$tree = $tb
|
|
->root('root_name', 'array')
|
|
->fixXmlConfig('encoder')
|
|
->children()
|
|
->node('encoders', 'array')
|
|
->useAttributeAsKey('class')
|
|
->prototype('array')
|
|
->beforeNormalization()->ifString()->then(function($v) { return array('algorithm' => $v); })->end()
|
|
->children()
|
|
->node('algorithm', 'scalar')->end()
|
|
->end()
|
|
->end()
|
|
->end()
|
|
->end()
|
|
->end()
|
|
->buildTree()
|
|
;
|
|
|
|
$normalized = array(
|
|
'encoders' => array(
|
|
'foo' => array('algorithm' => 'plaintext'),
|
|
),
|
|
);
|
|
|
|
$this->assertNormalized($tree, $denormalized, $normalized);
|
|
}
|
|
|
|
public function getEncoderTests()
|
|
{
|
|
$configs = array();
|
|
|
|
// XML
|
|
$configs[] = array(
|
|
'encoder' => array(
|
|
array('class' => 'foo', 'algorithm' => 'plaintext'),
|
|
),
|
|
);
|
|
|
|
// XML when only one element of this type
|
|
$configs[] = array(
|
|
'encoder' => array('class' => 'foo', 'algorithm' => 'plaintext'),
|
|
);
|
|
|
|
// YAML/PHP
|
|
$configs[] = array(
|
|
'encoders' => array(
|
|
array('class' => 'foo', 'algorithm' => 'plaintext'),
|
|
),
|
|
);
|
|
|
|
// YAML/PHP
|
|
$configs[] = array(
|
|
'encoders' => array(
|
|
'foo' => 'plaintext',
|
|
),
|
|
);
|
|
|
|
// YAML/PHP
|
|
$configs[] = array(
|
|
'encoders' => array(
|
|
'foo' => array('algorithm' => 'plaintext'),
|
|
),
|
|
);
|
|
|
|
return array_map(function($v) {
|
|
return array($v);
|
|
}, $configs);
|
|
}
|
|
|
|
/**
|
|
* @dataProvider getAnonymousKeysTests
|
|
*/
|
|
public function testAnonymousKeysArray($denormalized)
|
|
{
|
|
$tb = new TreeBuilder();
|
|
$tree = $tb
|
|
->root('root', 'array')
|
|
->children()
|
|
->node('logout', 'array')
|
|
->fixXmlConfig('handler')
|
|
->children()
|
|
->node('handlers', 'array')
|
|
->prototype('scalar')->end()
|
|
->end()
|
|
->end()
|
|
->end()
|
|
->end()
|
|
->end()
|
|
->buildTree()
|
|
;
|
|
|
|
$normalized = array('logout' => array('handlers' => array('a', 'b', 'c')));
|
|
|
|
$this->assertNormalized($tree, $denormalized, $normalized);
|
|
}
|
|
|
|
public function getAnonymousKeysTests()
|
|
{
|
|
$configs = array();
|
|
|
|
$configs[] = array(
|
|
'logout' => array(
|
|
'handlers' => array('a', 'b', 'c'),
|
|
),
|
|
);
|
|
|
|
$configs[] = array(
|
|
'logout' => array(
|
|
'handler' => array('a', 'b', 'c'),
|
|
),
|
|
);
|
|
|
|
return array_map(function($v) { return array($v); }, $configs);
|
|
}
|
|
|
|
public static function assertNormalized(NodeInterface $tree, $denormalized, $normalized)
|
|
{
|
|
self::assertSame($normalized, $tree->normalize($denormalized));
|
|
}
|
|
} |