diff --git a/src/Symfony/Component/Config/Definition/ScalarNode.php b/src/Symfony/Component/Config/Definition/ScalarNode.php index 655690b1670ee..2ee098935a2b8 100644 --- a/src/Symfony/Component/Config/Definition/ScalarNode.php +++ b/src/Symfony/Component/Config/Definition/ScalarNode.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Config\Definition; -use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException; +use Symfony\Component\Config\Definition\VariableNode; use Symfony\Component\Config\Definition\Exception\InvalidTypeException; /** @@ -26,56 +26,8 @@ * * @author Johannes M. Schmitt */ -class ScalarNode extends BaseNode implements PrototypeNodeInterface +class ScalarNode extends VariableNode { - protected $defaultValueSet = false; - protected $defaultValue; - protected $allowEmptyValue = true; - - /** - * {@inheritDoc} - */ - public function setDefaultValue($value) - { - $this->defaultValueSet = true; - $this->defaultValue = $value; - } - - /** - * {@inheritDoc} - */ - public function hasDefaultValue() - { - return $this->defaultValueSet; - } - - /** - * {@inheritDoc} - */ - public function getDefaultValue() - { - return $this->defaultValue; - } - - /** - * Sets if this node is allowed to have an empty value. - * - * @param boolean $boolean True if this entity will accept empty values. - * @return void - */ - public function setAllowEmptyValue($boolean) - { - $this->allowEmptyValue = (Boolean) $boolean; - } - - /** - * {@inheritDoc} - */ - public function setName($name) - { - $this->name = $name; - } - /** * {@inheritDoc} */ @@ -89,36 +41,4 @@ protected function validateType($value) )); } } - - /** - * {@inheritDoc} - */ - protected function finalizeValue($value) - { - if (!$this->allowEmptyValue && empty($value)) { - throw new InvalidConfigurationException(sprintf( - 'The path "%s" cannot contain an empty value, but got %s.', - $this->getPath(), - json_encode($value) - )); - } - - return $value; - } - - /** - * {@inheritDoc} - */ - protected function normalizeValue($value) - { - return $value; - } - - /** - * {@inheritDoc} - */ - protected function mergeValues($leftSide, $rightSide) - { - return $rightSide; - } } \ No newline at end of file diff --git a/src/Symfony/Component/Config/Definition/VariableNode.php b/src/Symfony/Component/Config/Definition/VariableNode.php index 78728001c304e..327143b984738 100644 --- a/src/Symfony/Component/Config/Definition/VariableNode.php +++ b/src/Symfony/Component/Config/Definition/VariableNode.php @@ -16,8 +16,8 @@ /** * This node represents a variable value in the config tree. * - * This node is intended for arbitrary variables. It behaves similar to scalar - * nodes except that any PHP type is accepted as a value. + * This node is intended for arbitrary variables. + * Any PHP type is accepted as a value. * * @author Jeremy Mikola */ @@ -110,4 +110,4 @@ protected function mergeValues($leftSide, $rightSide) { return $rightSide; } -} +} \ No newline at end of file