diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Config] implements feedback

This commit is contained in:
Victor Berchet 2012-02-20 19:15:01 +01:00
parent bc122bdb2d
commit 4feba09aa9
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
View File

@ -217,7 +217,7 @@ class Configuration implements ConfigurationInterface
->fixXmlConfig('resource')
->children()
->arrayNode('resources')
->addDefaultChildrenWhenNoneSet()
->addDefaultChildrenIfNoneSet()
->prototype('scalar')->defaultValue('FrameworkBundle:Form')->end()
->validate()
->ifTrue(function($v) {return !in_array('FrameworkBundle:Form', $v); })

2
src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
View File

@ -54,7 +54,7 @@ class Configuration implements ConfigurationInterface
->fixXmlConfig('resource')
->children()
->arrayNode('resources')
->addDefaultChildrenWhenNoneSet()
->addDefaultChildrenIfNoneSet()
->prototype('scalar')->defaultValue('form_div_layout.html.twig')->end()
->setExample(array('MyBundle::form.html.twig'))
->validate()

8
src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
View File

@ -109,7 +109,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
*
* @return ArrayNodeDefinition
*/
public function addDefaultChildrenWhenNoneSet($children = null)
public function addDefaultChildrenIfNoneSet($children = null)
{
$this->addDefaultChildren = null === $children ? 'defaults' : $children;
@ -369,6 +369,12 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
sprintf('->defaultValue() is not applicable to concrete nodes at path "%s"', $path)
);
}
if (false !== $this->addDefaultChildren) {
throw new InvalidDefinitionException(
sprintf('->addDefaultChildrenIfNoneSet() is not applicable to concrete nodes at path "%s"', $path)
);
}
}
/**

7
tests/Symfony/Tests/Component/Config/Definition/Builder/ArrayNodeDefinitionTest.php
View File

@ -49,6 +49,7 @@ class ArrayNodeDefinitionTest extends \PHPUnit_Framework_TestCase
{
return array(
array('defaultValue', array(array())),
array('addDefaultChildrenIfNoneSet', array()),
array('requiresAtLeastOneElement', array()),
array('useAttributeAsKey', array('foo'))
);
@ -72,7 +73,7 @@ class ArrayNodeDefinitionTest extends \PHPUnit_Framework_TestCase
$node = new ArrayNodeDefinition('root');
$node
->defaultValue(array())
->addDefaultChildrenWhenNoneSet('foo')
->addDefaultChildrenIfNoneSet('foo')
->prototype('array')
;
$node->getNode();
@ -82,7 +83,7 @@ class ArrayNodeDefinitionTest extends \PHPUnit_Framework_TestCase
{
$node = new ArrayNodeDefinition('root');
$node
->addDefaultChildrenWhenNoneSet()
->addDefaultChildrenIfNoneSet()
->prototype('array')
;
$tree = $node->getNode();
@ -93,7 +94,7 @@ class ArrayNodeDefinitionTest extends \PHPUnit_Framework_TestCase
{
$node = new ArrayNodeDefinition('root');
$node
->addDefaultChildrenWhenNoneSet()
->addDefaultChildrenIfNoneSet()
->prototype('array')
->prototype('array')
;