symfony · Mar 9, 2011 · Feb 24, 2011 · Feb 24, 2011 · Feb 28, 2011 · Feb 28, 2011
diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php
@@ -61,7 +61,6 @@ public function __construct($name, NodeInterface $parent = null)
      * Sets the xml remappings that should be performed.
      *
      * @param array $remappings an array of the form array(array(string, string))
-     * @return void
      */
     public function setXmlRemappings(array $remappings)
     {
@@ -73,15 +72,14 @@ public function setXmlRemappings(array $remappings)
      * contain. By default this is zero, meaning no elements.
      *
      * @param integer $number
-     * @return void
      */
     public function setMinNumberOfElements($number)
     {
         $this->minNumberOfElements = $number;
     }
 
     /**
-     * The name of the attribute that should be used as key.
+     * The name of the attribute which value should be used as key.
      *
      * This is only relevant for XML configurations, and only in combination
      * with a prototype based node.
@@ -92,14 +90,13 @@ public function setMinNumberOfElements($number)
      *
      * becomes
      *
-     *     'id' => array('foo' => 'bar')
+     *     'my_name' => array('foo' => 'bar')
      *
      * If $remove is false, the resulting array will still have the
      * "'id' => 'my_name'" item in it.
      *
-     * @param string $attribute The name of the attribute to use as a key
+     * @param string $attribute The name of the attribute which value is to be used as a key
      * @param Boolean $remove Whether or not to remove the key
-     * @return void
      */
     public function setKeyAttribute($attribute, $remove = true)
     {
@@ -112,7 +109,6 @@ public function setKeyAttribute($attribute, $remove = true)
      * defined in any of the configuration files.
      *
      * @param Boolean $boolean
-     * @return void
      */
     public function setAddIfNotSet($boolean)
     {
@@ -124,7 +120,6 @@ public function setAddIfNotSet($boolean)
      * be unset.
      *
      * @param Boolean $allow
-     * @return void
      */
     public function setAllowFalse($allow)
     {
@@ -135,7 +130,6 @@ public function setAllowFalse($allow)
      * Sets whether new keys can be defined in subsequent configurations.
      *
      * @param Boolean $allow
-     * @return void
      */
     public function setAllowNewKeys($allow)
     {
@@ -238,7 +232,7 @@ public function getDefaultValue()
      * Sets the node prototype.
      *
      * @param PrototypeNodeInterface $node 
-     * @throws \RuntimeException if the node doesn't have concrete children
+     * @throws \RuntimeException if the node has concrete children
      */
     public function setPrototype(PrototypeNodeInterface $node)
     {
@@ -356,10 +350,10 @@ protected function validateType($value)
     }
 
     /**
-     * Normalises the value.
+     * Normalizes the value.
      *
-     * @param mixed $value The value to normalise
-     * @return mixed The normalised value
+     * @param mixed $value The value to normalize
+     * @return mixed The normalized value
      */
     protected function normalizeValue($value)
     {
@@ -378,16 +372,13 @@ protected function normalizeValue($value)
             unset($value[$singular]);
         }
 
-        if (null !== $this->prototype) {
-            $normalized = array();
+        $normalized = array();
+        if (null !== $this->prototype) {            
             foreach ($value as $k => $v) {
                 if (null !== $this->keyAttribute && is_array($v)) {
                     if (!isset($v[$this->keyAttribute]) && is_int($k)) {
-                        throw new InvalidConfigurationException(sprintf(
-                            'You must set a "%s" attribute for path "%s".',
-                            $this->keyAttribute,
-                            $this->getPath()
-                        ));
+                        $msg = sprintf('The attribute "%s" must be set for path "%s".', $this->keyAttribute, $this->getPath());
+                        throw new InvalidConfigurationException($msg);
                     } else if (isset($v[$this->keyAttribute])) {
                         $k = $v[$this->keyAttribute];
 
@@ -398,11 +389,8 @@ protected function normalizeValue($value)
                     }
 
                     if (array_key_exists($k, $normalized)) {
-                        throw new DuplicateKeyException(sprintf(
-                            'Duplicate key "%s" for path "%s".',
-                            $k,
-                            $this->getPath()
-                        ));
+                        $msg = sprintf('Duplicate key "%s" for path "%s".', $k, $this->getPath());
+                        throw new DuplicateKeyException($msg);
                     }
                 }
 
@@ -413,25 +401,19 @@ protected function normalizeValue($value)
                     $normalized[] = $this->prototype->normalize($v);
                 }
             }
-
-            return $normalized;
-        }
-
-        $normalized = array();
-        foreach ($this->children as $name => $child) {
-            if (!array_key_exists($name, $value)) {
-                continue;
+        } else {
+            foreach ($this->children as $name => $child) {
+                if (array_key_exists($name, $value)) {
+                    $normalized[$name] = $child->normalize($value[$name]);
+                    unset($value[$name]);
+                }
             }
 
-            $normalized[$name] = $child->normalize($value[$name]);
-            unset($value[$name]);
-        }
-
-        // if extra fields are present, throw exception
-        if (count($value) && !$this->ignoreExtraKeys) {
-            $msg = sprintf('Unrecognized options "%s" under "%s"', implode(', ', array_keys($value)), $this->getPath());
-
-            throw new InvalidConfigurationException($msg);
+            // if extra fields are present, throw exception
+            if (count($value) && !$this->ignoreExtraKeys) {
+                $msg = sprintf('Unrecognized options "%s" under "%s"', implode(', ', array_keys($value)), $this->getPath());
+                throw new InvalidConfigurationException($msg);
+            }
         }
 
         return $normalized;

diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
@@ -57,7 +57,6 @@ public function __construct($name, NodeInterface $parent = null)
      *
      * @param mixed $originalValue 
      * @param mixed $equivalentValue 
-     * @return void
      */
     public function addEquivalentValue($originalValue, $equivalentValue)
     {
@@ -67,8 +66,7 @@ public function addEquivalentValue($originalValue, $equivalentValue)
     /**
      * Set this node as required.
      *
-     * @param boolean $boolean Required node
-     * @return void
+     * @param Boolean $boolean Required node
      */
     public function setRequired($boolean)
     {
@@ -78,8 +76,7 @@ public function setRequired($boolean)
     /**
      * Sets if this node can be overridden.
      *
-     * @param boolean $allow 
-     * @return void
+     * @param Boolean $allow
      */
     public function setAllowOverwrite($allow)
     {
@@ -90,7 +87,6 @@ public function setAllowOverwrite($allow)
      * Sets the closures used for normalization.
      *
      * @param array $closures An array of Closures used for normalization
-     * @return void
      */
     public function setNormalizationClosures(array $closures)
     {
@@ -101,7 +97,6 @@ public function setNormalizationClosures(array $closures)
      * Sets the closures used for final validation.
      *
      * @param array $closures An array of Closures used for final validation
-     * @return void
      */
     public function setFinalValidationClosures(array $closures)
     {
@@ -111,7 +106,7 @@ public function setFinalValidationClosures(array $closures)
     /**
      * Checks if this node is required.
      *
-     * @return boolean 
+     * @return Boolean
      */
     public function isRequired()
     {
@@ -232,8 +227,7 @@ public final function finalize($value)
      * Validates the type of a Node.
      *
      * @param mixed $value The value to validate
-     * @return void
-     * @throws \InvalidTypeException when the value is invalid
+     * @throws InvalidTypeException when the value is invalid
      */
     abstract protected function validateType($value);
 

diff --git a/src/Symfony/Component/Config/Definition/BooleanNode.php b/src/Symfony/Component/Config/Definition/BooleanNode.php
@@ -20,8 +20,6 @@ class BooleanNode extends ScalarNode
      */
     protected function validateType($value)
     {
-        parent::validateType($value);
-
         if (!is_bool($value)) {
             throw new InvalidTypeException(sprintf(
                 'Invalid type for path "%s". Expected boolean, but got %s.',

diff --git a/src/Symfony/Component/Config/Definition/Builder/BuilderInterface.php b/src/Symfony/Component/Config/Definition/Builder/BuilderInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Definition\Builder;
+
+/**
+ * Defines a common interface for node & tree builders
+ *
+ * @author Victor Berchet <victor@suumit.com>
+ */
+interface BuilderInterface
+{    
+}
+
diff --git a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php
@@ -26,17 +26,17 @@ class ExprBuilder
     /**
      * Constructor
      *
-     * @param Symfony\Component\Config\Definition\Builder\NodeBuilder $parent The parent node
+     * @param NodeBuilder $parent The parent node
      */
-    public function __construct($parent)
+    public function __construct(NodeBuilder $parent)
     {
         $this->parent = $parent;
     }
 
     /**
      * Mark the expression as being always used.
      *
-     * @return Symfony\Component\Config\Definition\Builder\ExprBuilder
+     * @return ExprBuilder
      */
     public function always()
     {
@@ -51,7 +51,7 @@ public function always()
      * The default one tests if the value is true.
      *
      * @param \Closure $closure
-     * @return Symfony\Component\Config\Definition\Builder\ExprBuilder
+     * @return ExprBuilder
      */
     public function ifTrue(\Closure $closure = null)
     {
@@ -67,7 +67,7 @@ public function ifTrue(\Closure $closure = null)
     /**
      * Tests if the value is a string.
      *
-     * @return Symfony\Component\Config\Definition\Builder\ExprBuilder
+     * @return ExprBuilder
      */
     public function ifString()
     {
@@ -79,7 +79,7 @@ public function ifString()
     /**
      * Tests if the value is null.
      *
-     * @return Symfony\Component\Config\Definition\Builder\ExprBuilder
+     * @return ExprBuilder
      */
     public function ifNull()
     {
@@ -91,7 +91,7 @@ public function ifNull()
     /**
      * Tests if the value is an array.
      *
-     * @return Symfony\Component\Config\Definition\Builder\ExprBuilder
+     * @return ExprBuilder
      */
     public function ifArray()
     {
@@ -105,7 +105,7 @@ public function ifArray()
      *
      * @param array $array
      *
-     * @return Symfony\Component\Config\Definition\Builder\ExprBuilder
+     * @return ExprBuilder
      */
     public function ifInArray(array $array)
     {
@@ -119,7 +119,7 @@ public function ifInArray(array $array)
      *
      * @param array $array
      *
-     * @return Symfony\Component\Config\Definition\Builder\ExprBuilder
+     * @return ExprBuilder
      */
     public function ifNotInArray(array $array)
     {
@@ -133,7 +133,7 @@ public function ifNotInArray(array $array)
      *
      * @param \Closure $closure
      *
-     * @return Symfony\Component\Config\Definition\Builder\ExprBuilder
+     * @return ExprBuilder
      */
     public function then(\Closure $closure)
     {
@@ -145,7 +145,7 @@ public function then(\Closure $closure)
     /**
      * Sets a closure returning an empty array.
      *
-     * @return Symfony\Component\Config\Definition\Builder\ExprBuilder
+     * @return ExprBuilder
      */
     public function thenEmptyArray()
     {
@@ -161,7 +161,7 @@ public function thenEmptyArray()
      *
      * @param string $message
      *
-     * @return Symfony\Component\Config\Definition\Builder\ExprBuilder
+     * @return ExprBuilder
      */
     public function thenInvalid($message)
     {
@@ -173,7 +173,7 @@ public function thenInvalid($message)
     /**
      * Sets a closure unsetting this key of the array at validation time.
      *
-     * @return Symfony\Component\Config\Definition\Builder\ExprBuilder
+     * @return ExprBuilder
      */
     public function thenUnset()
     {
@@ -185,7 +185,7 @@ public function thenUnset()
     /**
      * Returns the parent node
      *
-     * @return Symfony\Component\Config\Definition\Builder\NodeBuilder
+     * @return NodeBuilder
      */
     public function end()
     {