diff --git a/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php index 060bb9af0c833..981f427a5f753 100644 --- a/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php @@ -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; } @@ -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( @@ -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; }