Skip to content

Tree builder #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from
Mar 9, 2011
Merged

Tree builder #121

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f2380a
Removed duplicated code
stof Feb 27, 2011
a960355
Fixed type-hinting and renamed the method to be more semantic
stof Feb 27, 2011
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
42 changes: 7 additions & 35 deletions src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ protected function createConfigNode(NodeBuilder $node)
protected function createBooleanConfigNode(NodeBuilder $node)
{
$configNode = new BooleanNode($node->name, $node->parent);
$this->configureScalarNode($configNode, $node);
$this->configureVariableNode($configNode, $node);

return $configNode;
}
Expand All @@ -104,18 +104,18 @@ protected function createBooleanConfigNode(NodeBuilder $node)
protected function createScalarConfigNode(NodeBuilder $node)
{
$configNode = new ScalarNode($node->name, $node->parent);
$this->configureScalarNode($configNode, $node);
$this->configureVariableNode($configNode, $node);

return $configNode;
}

/**
* Configures a scalar node.
* Configures a variable node.
*
* @param ScalarNode $configNode The node to configure
* @param NodeBuilder $node The builder of the node
* @param VariableNode $configNode The node to configure
* @param NodeBuilder $node The builder of the node
*/
protected function configureScalarNode(ScalarNode $configNode, NodeBuilder $node)
protected function configureVariableNode(VariableNode $configNode, NodeBuilder $node)
{
if (null !== $node->normalization) {
$configNode->setNormalizationClosures(
Expand Down Expand Up @@ -157,35 +157,7 @@ protected function configureScalarNode(ScalarNode $configNode, NodeBuilder $node
protected function createVariableConfigNode(NodeBuilder $node)
{
$configNode = new VariableNode($node->name, $node->parent);

if (null !== $node->normalization) {
$configNode->setNormalizationClosures(
$this->buildExpressions($node->normalization->before)
);
}

if (null !== $node->merge) {
$configNode->setAllowOverwrite($node->merge->allowOverwrite);
}

if (true === $node->default) {
$configNode->setDefaultValue($node->defaultValue);
}

if (false === $node->allowEmptyValue) {
$configNode->setAllowEmptyValue($node->allowEmptyValue);
}

$configNode->addEquivalentValue(null, $node->nullEquivalent);
$configNode->addEquivalentValue(true, $node->trueEquivalent);
$configNode->addEquivalentValue(false, $node->falseEquivalent);
$configNode->setRequired($node->required);

if (null !== $node->validation) {
$configNode->setFinalValidationClosures(
$this->buildExpressions($node->validation->rules)
);
}
$this->configureVariableNode($configNode, $node);

return $configNode;
}
Expand Down