[Config] Renaming the key attribute removal property for consistency …

…per Johannes' recommendation. Also fixing a PHPDoc typo per Stof.
symfony · Feb 18, 2011 · 48459e9 · 48459e9
1 parent 663dcbc
commit 48459e9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php
@@ -28,7 +28,7 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
     protected $children;
     protected $prototype;
     protected $keyAttribute;
-    protected $keyAttributeIsRemoved;
+    protected $removeKeyAttribute;
     protected $allowFalse;
     protected $allowNewKeys;
     protected $addIfNotSet;
@@ -49,7 +49,7 @@ public function __construct($name, NodeInterface $parent = null)
 
         $this->children = array();
         $this->xmlRemappings = array();
-        $this->keyAttributeIsRemoved = true;
+        $this->removeKeyAttribute = true;
         $this->allowFalse = false;
         $this->addIfNotSet = false;
         $this->allowNewKeys = true;
@@ -115,9 +115,9 @@ public function setKeyAttribute($attribute)
      *
      * @param Boolean $remove Whether or not the key attribute should be removed.
      */
-    public function setKeyAttributeIsRemoved($remove)
+    public function setRemoveKeyAttribute($remove)
     {
-        $this->keyAttributeIsRemoved = $remove;
+        $this->removeKeyAttribute = $remove;
     }
 
     /**
@@ -394,7 +394,7 @@ protected function normalizeValue($value)
                         $k = $v[$this->keyAttribute];
 
                         // remove the key attribute if configured to
-                        if ($this->keyAttributeIsRemoved) {
+                        if ($this->removeKeyAttribute) {
                             unset($v[$this->keyAttribute]);
                         }
                     }
@@ -497,7 +497,7 @@ protected function mergeValues($leftSide, $rightSide)
     }
 
     /**
-     * Set whether or not to this array should just prevent child values from
+     * Set whether or not this array should just prevent child values from
      * keys that have no corresponding child nodes.
      *
      * If true (default), an exception will be thrown if unrecognized options

diff --git a/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php
@@ -167,7 +167,7 @@ protected function createArrayConfigNode(NodeBuilder $node)
 
         if (null !== $node->key) {
             $configNode->setKeyAttribute($node->key);
-            $configNode->setKeyAttributeIsRemoved($node->removeKeyItem);
+            $configNode->setRemoveKeyAttribute($node->removeKeyItem);
         }
 
         if (true === $node->atLeastOne) {

diff --git a/tests/Symfony/Tests/Component/Config/Definition/ArrayNodeTest.php b/tests/Symfony/Tests/Component/Config/Definition/ArrayNodeTest.php
@@ -129,7 +129,7 @@ public function testMappedAttributeKeyNotRemoved()
     {
         $node = new ArrayNode('root');
         $node->setKeyAttribute('id');
-        $node->setKeyAttributeIsRemoved(false);
+        $node->setRemoveKeyAttribute(false);
 
         $prototype = new ArrayNode(null);
         $prototype->setPreventExtraKeys(false); // just so it allows anything