horros / agavi2

src/config/ConfigValueHolder.class.php

Unused Use Statements -1 removed lines

@@ -15,7 +15,6 @@
 
 namespace Agavi\Config;
 
-use Agavi\Config\Util\Dom\XmlConfigDomElement;
 use Agavi\Util\Inflector;
 /**
  * ConfigValueHolder is the storage class for the XmlConfigHandler

Spacing +13 added lines, -13 removed lines

@@ -105,12 +105,12 @@ 
 	 */
 	public function __get($name)
 	{
-		if(isset($this->_childs[$name])) {
+		if (isset($this->_childs[$name])) {
 			return $this->_childs[$name];
 		} else {
 			$tagName = $name;
 			$tagNameStart = '';
-			if(($lastUScore = strrpos($tagName, '_')) !== false) {
+			if (($lastUScore = strrpos($tagName, '_')) !== false) {
 				$lastUScore++;
 				$tagNameStart = substr($tagName, 0, $lastUScore);
 				$tagName = substr($tagName, $lastUScore);
@@ -119,14 +119,14 @@ 
 			// check if the requested node was specified using the plural version
 			// and create a "virtual" node which reflects the non existent plural node
 			$singularName = $tagNameStart . Inflector::singularize($tagName);
-			if($this->hasChildren($singularName)) {
+			if ($this->hasChildren($singularName)) {
 
 				$vh = new ConfigValueHolder();
 				$vh->setName($name);
 
 				/** @var ConfigValueHolder $child */
-				foreach($this->_childs as $child) {
-					if($child->getName() == $singularName) {
+				foreach ($this->_childs as $child) {
+					if ($child->getName() == $singularName) {
 						$vh->addChildren($singularName, $child);
 					}
 				}
@@ -151,7 +151,7 @@ 
 	 */
 	public function addChildren($name, $children)
 	{
-		if(!$this->hasChildren($name)) {
+		if (!$this->hasChildren($name)) {
 			$this->$name = $children;
 			$this->_childs[$name] = $children;
 		} else {
@@ -185,16 +185,16 @@ 
 	 */
 	public function hasChildren($child = null)
 	{
-		if($child === null) {
+		if ($child === null) {
 			return count($this->_childs) > 0;
 		}
 
-		if(isset($this->_childs[$child])) {
+		if (isset($this->_childs[$child])) {
 			return true;
 		} else {
 			$tagName = $child;
 			$tagNameStart = '';
-			if(($lastUScore = strrpos($tagName, '_')) !== false) {
+			if (($lastUScore = strrpos($tagName, '_')) !== false) {
 				$lastUScore++;
 				$tagNameStart = substr($tagName, 0, $lastUScore);
 				$tagName = substr($tagName, $lastUScore);
@@ -217,13 +217,13 @@ 
 	 */
 	public function getChildren($nodename = null)
 	{
-		if($nodename === null) {
+		if ($nodename === null) {
 			return $this->_childs;
 		} else {
 			$childs = array();
 			/** @var ConfigValueHolder $child */
-			foreach($this->_childs as $child) {
-				if($child->getName() == $nodename) {
+			foreach ($this->_childs as $child) {
+				if ($child->getName() == $nodename) {
 					$childs[] = $child;
 				}
 			}
@@ -365,7 +365,7 @@ 
 	 */
 	public function offsetGet($offset)
 	{
-		if(!isset($this->_childs[$offset]))
+		if (!isset($this->_childs[$offset]))
 			return null;
 		return $this->_childs[$offset];
 	}

Braces +3 added lines, -2 removed lines

@@ -365,8 +365,9 @@
 	 */
 	public function offsetGet($offset)
 	{
-		if(!isset($this->_childs[$offset]))
-			return null;
+		if(!isset($this->_childs[$offset])) {
+					return null;
+		}
 		return $this->_childs[$offset];
 	}
 

Indentation +388 added lines, -388 removed lines

@@ -35,394 +35,394 @@
  */
 class ConfigValueHolder implements \ArrayAccess, \IteratorAggregate
 {
-	/**
-	 * @var        string The name of this value.
-	 */
-	protected $_name = '';
-	/**
-	 * @var        array The attributes of this value.
-	 */
-	protected $_attributes = array();
-	/**
-	 * @var        array The child nodes of this value.
-	 */
-	protected $_childs = array();
-	/**
-	 * @var        string The value.
-	 */
-	protected $_value = null;
-
-	/**
-	 * Sets the name of this value.
-	 *
-	 * @param      string $name The name.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function setName($name)
-	{
-		$this->_name = $name;
-	}
-
-	/**
-	 * Returns the name of this value.
-	 *
-	 * @return     string The name.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getName()
-	{
-		return $this->_name;
-	}
-
-	/**
-	 * isset() overload.
-	 *
-	 * @param      string $name Name of the child.
-	 *
-	 * @return     bool Whether or not that child exists.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function __isset($name)
-	{
-		return $this->hasChildren($name);
-	}
-
-	/**
-	 * Magic getter overload.
-	 *
-	 * @param      string $name Name of the child .
-	 *
-	 * @return     ConfigValueHolder The child, if it exists.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function __get($name)
-	{
-		if(isset($this->_childs[$name])) {
-			return $this->_childs[$name];
-		} else {
-			$tagName = $name;
-			$tagNameStart = '';
-			if(($lastUScore = strrpos($tagName, '_')) !== false) {
-				$lastUScore++;
-				$tagNameStart = substr($tagName, 0, $lastUScore);
-				$tagName = substr($tagName, $lastUScore);
-			}
-
-			// check if the requested node was specified using the plural version
-			// and create a "virtual" node which reflects the non existent plural node
-			$singularName = $tagNameStart . Inflector::singularize($tagName);
-			if($this->hasChildren($singularName)) {
-
-				$vh = new ConfigValueHolder();
-				$vh->setName($name);
-
-				/** @var ConfigValueHolder $child */
-				foreach($this->_childs as $child) {
-					if($child->getName() == $singularName) {
-						$vh->addChildren($singularName, $child);
-					}
-				}
-
-				return $vh;
-			} else {
-				//throw new AgaviException('Node with the name ' . $name . ' does not exist ('.$this->getName().', '.implode(', ', array_keys($this->_childs)).')');
-				return null;
-			}
-		}
-	}
-
-	/**
-	 * Adds a named children to this value. If a children with the same name
-	 * already exists the given value will be appended to the children.
-	 *
-	 * @param      string            $name     The name of the child.
-	 * @param      ConfigValueHolder $children The child value.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function addChildren($name, $children)
-	{
-		if(!$this->hasChildren($name)) {
-			$this->$name = $children;
-			$this->_childs[$name] = $children;
-		} else {
-			$this->appendChildren($children);
-		}
-	}
-
-	/**
-	 * Adds a unnamed children to this value.
-	 *
-	 * @param      ConfigValueHolder $children The child value.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function appendChildren($children)
-	{
-		$this->_childs[] = $children;
-	}
-
-	/**
-	 * Checks whether the value has children at all (no params) or whether a
-	 * child with the given name exists.
-	 *
-	 * @param      string $child The name of the child.
-	 *
-	 * @return     bool True if children exist, false if not.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function hasChildren($child = null)
-	{
-		if($child === null) {
-			return count($this->_childs) > 0;
-		}
-
-		if(isset($this->_childs[$child])) {
-			return true;
-		} else {
-			$tagName = $child;
-			$tagNameStart = '';
-			if(($lastUScore = strrpos($tagName, '_')) !== false) {
-				$lastUScore++;
-				$tagNameStart = substr($tagName, 0, $lastUScore);
-				$tagName = substr($tagName, $lastUScore);
-			}
-
-			$singularName = $tagNameStart . Inflector::singularize($tagName);
-			return isset($this->_childs[$singularName]);
-		}
-	}
-
-	/**
-	 * Returns the children of this value.
-	 *
-	 * @param      string $nodename Return only the childs matching this node (tag) name.
-	 *
-	 * @return     ConfigValueHolder[] An array with the childs of this value.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getChildren($nodename = null)
-	{
-		if($nodename === null) {
-			return $this->_childs;
-		} else {
-			$childs = array();
-			/** @var ConfigValueHolder $child */
-			foreach($this->_childs as $child) {
-				if($child->getName() == $nodename) {
-					$childs[] = $child;
-				}
-			}
-
-			return $childs;
-		}
-	}
-
-	/**
-	 * Set an attribute.
-	 *
-	 * If an attribute with the name already exists the value will be
-	 * overridden.
-	 *
-	 * @param      string $name  An attribute name.
-	 * @param      mixed  $value An attribute value.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function setAttribute($name, $value)
-	{
-		$this->_attributes[$name] = $value;
-	}
-
-	/**
-	 * Indicates whether or not an attribute exists.
-	 *
-	 * @param      string $name An attribute name.
-	 *
-	 * @return     bool true, if the attribute exists, otherwise false.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function hasAttribute($name)
-	{
-		return isset($this->_attributes[$name]);
-	}
-
-	/**
-	 * Retrieve an attribute.
-	 *
-	 * @param      string $name    An attribute name.
-	 * @param      mixed  $default A default attribute value.
-	 *
-	 * @return     mixed An attribute value, if the attribute exists, otherwise
-	 *                   null or the given default.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getAttribute($name, $default = null)
-	{
-		return isset($this->_attributes[$name]) ? $this->_attributes[$name] : $default;
-	}
-
-	/**
-	 * Retrieve all attributes.
-	 *
-	 * @return     array An associative array of attributes.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getAttributes()
-	{
-		return $this->_attributes;
-	}
-
-	/**
-	 * Set the value of this value node.
-	 *
-	 * @param      string $value A value.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function setValue($value)
-	{
-		$this->_value = $value;
-	}
-
-	/**
-	 * Retrieves the value of this value node.
-	 *
-	 * @return     string The value of this node.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getValue()
-	{
-		return $this->_value;
-	}
-
-	/**
-	 * Retrieves the info of this value node.
-	 *
-	 * @return     array An array containing the info for this node.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getNode()
-	{
-		return array(
-			'name' => $this->_name,
-			'attributes' => $this->_attributes,
-			'children' => $this->_childs,
-			'value' => $this->_value,
-		);
-	}
-
-	/**
-	 * Determines if a named child exists. From ArrayAccess.
-	 *
-	 * @param      string $offset Offset to check
-	 *
-	 * @return     bool Whether the offset exists.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function offsetExists($offset)
-	{
-		return isset($this->_childs[$offset]);
-	}
-
-	/**
-	 * Retrieves a named child. From ArrayAccess.
-	 *
-	 * @param      string $offset Offset to retrieve
-	 *
-	 * @return     ConfigValueHolder The child value.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function offsetGet($offset)
-	{
-		if(!isset($this->_childs[$offset]))
-			return null;
-		return $this->_childs[$offset];
-	}
-
-	/**
-	 * Inserts a named child. From ArrayAccess.
-	 *
-	 * @param      string            $offset Offset to modify
-	 * @param      ConfigValueHolder $value  The child value.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function offsetSet($offset, $value)
-	{
-		$this->_childs[$offset] = $value;
-	}
-
-	/**
-	 * Deletes a named child. From ArrayAccess.
-	 *
-	 * @return     string $offset Offset to delete.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function offsetUnset($offset)
-	{
-		unset($this->_childs[$offset]);
-	}
-
-	/**
-	 * Returns an Iterator for the child nodes. From IteratorAggregate.
-	 *
-	 * @return     \Iterator The iterator.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getIterator()
-	{
-		return new \ArrayIterator($this->getChildren());
-	}
-
-	/**
-	 * Retrieves the string representation of this value node. This is 
-	 * currently only the value of the node.
-	 *
-	 * @return     string The string representation.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function __toString()
-	{
-		return $this->_value;
-	}
+    /**
+     * @var        string The name of this value.
+     */
+    protected $_name = '';
+    /**
+     * @var        array The attributes of this value.
+     */
+    protected $_attributes = array();
+    /**
+     * @var        array The child nodes of this value.
+     */
+    protected $_childs = array();
+    /**
+     * @var        string The value.
+     */
+    protected $_value = null;
+
+    /**
+     * Sets the name of this value.
+     *
+     * @param      string $name The name.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function setName($name)
+    {
+        $this->_name = $name;
+    }
+
+    /**
+     * Returns the name of this value.
+     *
+     * @return     string The name.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getName()
+    {
+        return $this->_name;
+    }
+
+    /**
+     * isset() overload.
+     *
+     * @param      string $name Name of the child.
+     *
+     * @return     bool Whether or not that child exists.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function __isset($name)
+    {
+        return $this->hasChildren($name);
+    }
+
+    /**
+     * Magic getter overload.
+     *
+     * @param      string $name Name of the child .
+     *
+     * @return     ConfigValueHolder The child, if it exists.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function __get($name)
+    {
+        if(isset($this->_childs[$name])) {
+            return $this->_childs[$name];
+        } else {
+            $tagName = $name;
+            $tagNameStart = '';
+            if(($lastUScore = strrpos($tagName, '_')) !== false) {
+                $lastUScore++;
+                $tagNameStart = substr($tagName, 0, $lastUScore);
+                $tagName = substr($tagName, $lastUScore);
+            }
+
+            // check if the requested node was specified using the plural version
+            // and create a "virtual" node which reflects the non existent plural node
+            $singularName = $tagNameStart . Inflector::singularize($tagName);
+            if($this->hasChildren($singularName)) {
+
+                $vh = new ConfigValueHolder();
+                $vh->setName($name);
+
+                /** @var ConfigValueHolder $child */
+                foreach($this->_childs as $child) {
+                    if($child->getName() == $singularName) {
+                        $vh->addChildren($singularName, $child);
+                    }
+                }
+
+                return $vh;
+            } else {
+                //throw new AgaviException('Node with the name ' . $name . ' does not exist ('.$this->getName().', '.implode(', ', array_keys($this->_childs)).')');
+                return null;
+            }
+        }
+    }
+
+    /**
+     * Adds a named children to this value. If a children with the same name
+     * already exists the given value will be appended to the children.
+     *
+     * @param      string            $name     The name of the child.
+     * @param      ConfigValueHolder $children The child value.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function addChildren($name, $children)
+    {
+        if(!$this->hasChildren($name)) {
+            $this->$name = $children;
+            $this->_childs[$name] = $children;
+        } else {
+            $this->appendChildren($children);
+        }
+    }
+
+    /**
+     * Adds a unnamed children to this value.
+     *
+     * @param      ConfigValueHolder $children The child value.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function appendChildren($children)
+    {
+        $this->_childs[] = $children;
+    }
+
+    /**
+     * Checks whether the value has children at all (no params) or whether a
+     * child with the given name exists.
+     *
+     * @param      string $child The name of the child.
+     *
+     * @return     bool True if children exist, false if not.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function hasChildren($child = null)
+    {
+        if($child === null) {
+            return count($this->_childs) > 0;
+        }
+
+        if(isset($this->_childs[$child])) {
+            return true;
+        } else {
+            $tagName = $child;
+            $tagNameStart = '';
+            if(($lastUScore = strrpos($tagName, '_')) !== false) {
+                $lastUScore++;
+                $tagNameStart = substr($tagName, 0, $lastUScore);
+                $tagName = substr($tagName, $lastUScore);
+            }
+
+            $singularName = $tagNameStart . Inflector::singularize($tagName);
+            return isset($this->_childs[$singularName]);
+        }
+    }
+
+    /**
+     * Returns the children of this value.
+     *
+     * @param      string $nodename Return only the childs matching this node (tag) name.
+     *
+     * @return     ConfigValueHolder[] An array with the childs of this value.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getChildren($nodename = null)
+    {
+        if($nodename === null) {
+            return $this->_childs;
+        } else {
+            $childs = array();
+            /** @var ConfigValueHolder $child */
+            foreach($this->_childs as $child) {
+                if($child->getName() == $nodename) {
+                    $childs[] = $child;
+                }
+            }
+
+            return $childs;
+        }
+    }
+
+    /**
+     * Set an attribute.
+     *
+     * If an attribute with the name already exists the value will be
+     * overridden.
+     *
+     * @param      string $name  An attribute name.
+     * @param      mixed  $value An attribute value.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function setAttribute($name, $value)
+    {
+        $this->_attributes[$name] = $value;
+    }
+
+    /**
+     * Indicates whether or not an attribute exists.
+     *
+     * @param      string $name An attribute name.
+     *
+     * @return     bool true, if the attribute exists, otherwise false.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function hasAttribute($name)
+    {
+        return isset($this->_attributes[$name]);
+    }
+
+    /**
+     * Retrieve an attribute.
+     *
+     * @param      string $name    An attribute name.
+     * @param      mixed  $default A default attribute value.
+     *
+     * @return     mixed An attribute value, if the attribute exists, otherwise
+     *                   null or the given default.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getAttribute($name, $default = null)
+    {
+        return isset($this->_attributes[$name]) ? $this->_attributes[$name] : $default;
+    }
+
+    /**
+     * Retrieve all attributes.
+     *
+     * @return     array An associative array of attributes.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getAttributes()
+    {
+        return $this->_attributes;
+    }
+
+    /**
+     * Set the value of this value node.
+     *
+     * @param      string $value A value.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function setValue($value)
+    {
+        $this->_value = $value;
+    }
+
+    /**
+     * Retrieves the value of this value node.
+     *
+     * @return     string The value of this node.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getValue()
+    {
+        return $this->_value;
+    }
+
+    /**
+     * Retrieves the info of this value node.
+     *
+     * @return     array An array containing the info for this node.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getNode()
+    {
+        return array(
+            'name' => $this->_name,
+            'attributes' => $this->_attributes,
+            'children' => $this->_childs,
+            'value' => $this->_value,
+        );
+    }
+
+    /**
+     * Determines if a named child exists. From ArrayAccess.
+     *
+     * @param      string $offset Offset to check
+     *
+     * @return     bool Whether the offset exists.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->_childs[$offset]);
+    }
+
+    /**
+     * Retrieves a named child. From ArrayAccess.
+     *
+     * @param      string $offset Offset to retrieve
+     *
+     * @return     ConfigValueHolder The child value.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function offsetGet($offset)
+    {
+        if(!isset($this->_childs[$offset]))
+            return null;
+        return $this->_childs[$offset];
+    }
+
+    /**
+     * Inserts a named child. From ArrayAccess.
+     *
+     * @param      string            $offset Offset to modify
+     * @param      ConfigValueHolder $value  The child value.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->_childs[$offset] = $value;
+    }
+
+    /**
+     * Deletes a named child. From ArrayAccess.
+     *
+     * @return     string $offset Offset to delete.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->_childs[$offset]);
+    }
+
+    /**
+     * Returns an Iterator for the child nodes. From IteratorAggregate.
+     *
+     * @return     \Iterator The iterator.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->getChildren());
+    }
+
+    /**
+     * Retrieves the string representation of this value node. This is 
+     * currently only the value of the node.
+     *
+     * @return     string The string representation.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function __toString()
+    {
+        return $this->_value;
+    }
 }
 
 ?>
\ No newline at end of file

src/config/LdmlConfigHandler.class.php

Doc Comments +2 added lines, -1 removed lines

@@ -846,6 +846,7 @@ 
 	 * @param      ConfigValueHolder The item.
 	 * @param      string The name of item.
 	 * @param      array The array to store the parsed data to.
+	 * @param string $name
 	 *
 	 * @return     array The array with the data.
 	 *
@@ -1004,7 +1005,7 @@ 
 	 * Unescapes a single unicode escape sequence. This is designed to be a 
 	 * preg_replace_callback callback function.
 	 * 
-	 * @param      array $matches The match.
+	 * @param      string[] $matches The match.
 	 *
 	 * @return     string The unescaped sequence.
 	 *

Spacing +169 added lines, -169 removed lines

@@ -64,9 +64,9 @@ 
 			'layout' => array('orientation' => array('lines' => 'top-to-bottom', 'characters' => 'left-to-right')),
 		);
 
-		foreach(array_reverse($lookupPaths) as $basename) {
+		foreach (array_reverse($lookupPaths) as $basename) {
 			$filePath = $pathParts['dirname'] . '/' . $basename . '.' . $pathParts['extension'];
-			if(is_readable($filePath)) {
+			if (is_readable($filePath)) {
 				$ldmlTree = ConfigCache::parseConfig($filePath, false, $this->getValidationFile(), $this->parser);
 				$this->prepareParentInformation($ldmlTree);
 				$this->parseLdmlTree($ldmlTree->ldml, $data);
@@ -84,14 +84,14 @@ 
 		);
 
 		// fix the day indices for all day fields
-		foreach($data['calendars'] as $calKey => &$calValue) {
+		foreach ($data['calendars'] as $calKey => &$calValue) {
 			// skip the 'default' => '' key => value pair
-			if(is_array($calValue)) {
-				if(isset($calValue['days']['format'])) {
-					foreach($calValue['days']['format'] as $formatKey => &$formatValue) {
-						if(is_array($formatValue)) {
+			if (is_array($calValue)) {
+				if (isset($calValue['days']['format'])) {
+					foreach ($calValue['days']['format'] as $formatKey => &$formatValue) {
+						if (is_array($formatValue)) {
 							$newData = array();
-							foreach($formatValue as $day => $value) {
+							foreach ($formatValue as $day => $value) {
 								$newData[$dayMap[$day]] = $value;
 							}
 							$formatValue = $newData;
@@ -99,11 +99,11 @@ 
 					}
 				}
 
-				if(isset($calValue['days']['stand-alone'])) {
-					foreach($calValue['days']['stand-alone'] as $formatKey => &$formatValue) {
-						if(is_array($formatValue)) {
+				if (isset($calValue['days']['stand-alone'])) {
+					foreach ($calValue['days']['stand-alone'] as $formatKey => &$formatValue) {
+						if (is_array($formatValue)) {
 							$newData = array();
-							foreach($formatValue as $day => $value) {
+							foreach ($formatValue as $day => $value) {
 								$newData[$dayMap[$day]] = $value;
 							}
 							$formatValue = $newData;
@@ -135,7 +135,7 @@ 
 		$ldmlTree->setAttribute('__agavi_parent_id', null);
 		$this->nodeRefs[$i] = $ldmlTree;
 		++$i;
-		if($ldmlTree->hasChildren()) {
+		if ($ldmlTree->hasChildren()) {
 			$this->generateParentInformation($ldmlTree->getChildren(), $i, 0);
 		}
 	}
@@ -153,12 +153,12 @@ 
 	protected function generateParentInformation($childList, &$nextId, $parentId)
 	{
 		/** @var ConfigValueHolder $child */
-		foreach($childList as $child) {
+		foreach ($childList as $child) {
 			$child->setAttribute('__agavi_node_id', $nextId);
 			$child->setAttribute('__agavi_parent_id', $parentId);
 			$this->nodeRefs[$nextId] = $child;
 			++$nextId;
-			if($child->hasChildren()) {
+			if ($child->hasChildren()) {
 				$this->generateParentInformation($child->getChildren(), $nextId, $child->getAttribute('__agavi_node_id'));
 			}
 		}
@@ -350,43 +350,43 @@ 
 	public function parseLdmlTree($ldmlTree, &$data)
 	{
 
-		if(isset($ldmlTree->identity)) {
+		if (isset($ldmlTree->identity)) {
 			$data['locale']['language'] = $ldmlTree->identity->language->getAttribute('type');
-			if(isset($ldmlTree->identity->territory)) {
+			if (isset($ldmlTree->identity->territory)) {
 				$data['locale']['territory'] = $ldmlTree->identity->territory->getAttribute('type');
 			}
-			if(isset($ldmlTree->identity->script)) {
+			if (isset($ldmlTree->identity->script)) {
 				$data['locale']['script'] = $ldmlTree->identity->script->getAttribute('type');
 			}
-			if(isset($ldmlTree->identity->variant)) {
+			if (isset($ldmlTree->identity->variant)) {
 				$data['locale']['variant'] = $ldmlTree->identity->variant->getAttribute('type');
 			}
 		}
 
-		if(isset($ldmlTree->localeDisplayNames)) {
+		if (isset($ldmlTree->localeDisplayNames)) {
 			$ldn = $ldmlTree->localeDisplayNames;
 
-			if(isset($ldn->languages)) {
+			if (isset($ldn->languages)) {
 				$data['displayNames']['languages'] = isset($data['displayNames']['languages']) ? $data['displayNames']['languages'] : array();
 				$this->getTypeList($ldn->languages, $data['displayNames']['languages']);
 			}
 
-			if(isset($ldn->scripts)) {
+			if (isset($ldn->scripts)) {
 				$data['displayNames']['scripts'] = isset($data['displayNames']['scripts']) ? $data['displayNames']['scripts'] : array();
 				$this->getTypeList($ldn->scripts, $data['displayNames']['scripts']);
 			}
 
-			if(isset($ldn->territories)) {
+			if (isset($ldn->territories)) {
 				$data['displayNames']['territories'] = isset($data['displayNames']['territories']) ? $data['displayNames']['territories'] : array();
 				$this->getTypeList($ldn->territories, $data['displayNames']['territories']);
 			}
 
-			if(isset($ldn->variants)) {
+			if (isset($ldn->variants)) {
 				$data['displayNames']['variants'] = isset($data['displayNames']['variants']) ? $data['displayNames']['variants'] : array();
 				$this->getTypeList($ldn->variants, $data['displayNames']['variants']);
 			}
 
-			if(isset($ldn->keys)) {
+			if (isset($ldn->keys)) {
 				$data['displayNames']['keys'] = isset($data['displayNames']['keys']) ? $data['displayNames']['keys'] : array();
 				$this->getTypeList($ldn->keys, $data['displayNames']['keys']);
 			}
@@ -397,138 +397,138 @@ 
 			}
 			*/
 
-			if(isset($ldn->measurementSystemNames)) {
+			if (isset($ldn->measurementSystemNames)) {
 				$data['displayNames']['measurementSystemNames'] = isset($data['displayNames']['measurementSystemNames']) ? $data['displayNames']['measurementSystemNames'] : array();
 				$this->getTypeList($ldn->measurementSystemNames, $data['displayNames']['measurementSystemNames']);
 			}
 		}
 
-		if(isset($ldmlTree->layout->orientation)) {
+		if (isset($ldmlTree->layout->orientation)) {
 			$ori = $ldmlTree->layout->orientation;
 
 			$data['layout']['orientation']['lines'] = $ori->getAttribute('lines', $data['layout']['orientation']['lines']);
 			$data['layout']['orientation']['characters'] = $ori->getAttribute('characters', $data['layout']['orientation']['characters']);
 		}
 
-		if(isset($ldmlTree->delimiters)) {
+		if (isset($ldmlTree->delimiters)) {
 			$delims = $ldmlTree->delimiters;
 
-			if(isset($delims->quotationStart)) {
+			if (isset($delims->quotationStart)) {
 				$data['delimiters']['quotationStart'] = $this->unescape($delims->quotationStart->getValue());
 			}
-			if(isset($delims->quotationEnd)) {
+			if (isset($delims->quotationEnd)) {
 				$data['delimiters']['quotationEnd'] = $this->unescape($delims->quotationEnd->getValue());
 			}
-			if(isset($delims->alternateQuotationStart)) {
+			if (isset($delims->alternateQuotationStart)) {
 				$data['delimiters']['alternateQuotationStart'] = $this->unescape($delims->alternateQuotationStart->getValue());
 			}
-			if(isset($delims->alternateQuotationEnd)) {
+			if (isset($delims->alternateQuotationEnd)) {
 				$data['delimiters']['alternateQuotationEnd'] = $this->unescape($delims->alternateQuotationEnd->getValue());
 			}
 		}
 
-		if(isset($ldmlTree->dates)) {
+		if (isset($ldmlTree->dates)) {
 			$dates = $ldmlTree->dates;
 
-			if(isset($dates->calendars)) {
+			if (isset($dates->calendars)) {
 				$cals = $dates->calendars;
 
-				foreach($cals as $calendar) {
+				foreach ($cals as $calendar) {
 
-					if($calendar->getName() == 'default') {
+					if ($calendar->getName() == 'default') {
 						$data['calendars']['default'] = $calendar->getAttribute('choice');
-					} elseif($calendar->getName() == 'calendar') {
+					} elseif ($calendar->getName() == 'calendar') {
 						$calendarName = $calendar->getAttribute('type');
 
-						if(!isset($data['calendars'][$calendarName])) {
+						if (!isset($data['calendars'][$calendarName])) {
 							$data['calendars'][$calendarName] = array();
 						}
 
-						if(isset($calendar->months)) {
+						if (isset($calendar->months)) {
 							$this->getCalendarWidth($calendar->months, 'month', $data['calendars'][$calendarName]);
 						}
 
-						if(isset($calendar->days)) {
+						if (isset($calendar->days)) {
 							$this->getCalendarWidth($calendar->days, 'day', $data['calendars'][$calendarName]);
 						}
 
-						if(isset($calendar->quarters)) {
+						if (isset($calendar->quarters)) {
 							$this->getCalendarWidth($calendar->quarters, 'quarter', $data['calendars'][$calendarName]);
 						}
 
-						if(isset($calendar->am)) {
+						if (isset($calendar->am)) {
 							$data['calendars'][$calendarName]['am'] = $this->unescape($calendar->am->getValue());
 						}
-						if(isset($calendar->pm)) {
+						if (isset($calendar->pm)) {
 							$data['calendars'][$calendarName]['pm'] = $this->unescape($calendar->pm->getValue());
 						}
 
-						if(isset($calendar->eras)) {
-							if(isset($calendar->eras->eraNames)) {
-								foreach($this->getChildsOrAlias($calendar->eras->eraNames) as $era) {
+						if (isset($calendar->eras)) {
+							if (isset($calendar->eras->eraNames)) {
+								foreach ($this->getChildsOrAlias($calendar->eras->eraNames) as $era) {
 									$data['calendars'][$calendarName]['eras']['wide'][$era->getAttribute('type')] = $this->unescape($era->getValue());
 								}
 							}
-							if(isset($calendar->eras->eraAbbr)) {
-								foreach($this->getChildsOrAlias($calendar->eras->eraAbbr) as $era) {
+							if (isset($calendar->eras->eraAbbr)) {
+								foreach ($this->getChildsOrAlias($calendar->eras->eraAbbr) as $era) {
 									$data['calendars'][$calendarName]['eras']['abbreviated'][$era->getAttribute('type')] = $this->unescape($era->getValue());
 								}
 							}
-							if(isset($calendar->eras->eraNarrow)) {
-								foreach($this->getChildsOrAlias($calendar->eras->eraNarrow) as $era) {
+							if (isset($calendar->eras->eraNarrow)) {
+								foreach ($this->getChildsOrAlias($calendar->eras->eraNarrow) as $era) {
 									$data['calendars'][$calendarName]['eras']['narrow'][$era->getAttribute('type')] = $this->unescape($era->getValue());
 								}
 							}
 						}
 
-						if(isset($calendar->dateFormats)) {
+						if (isset($calendar->dateFormats)) {
 							$this->getDateOrTimeFormats($calendar->dateFormats, 'dateFormat', $data['calendars'][$calendarName]);
 						}
-						if(isset($calendar->timeFormats)) {
+						if (isset($calendar->timeFormats)) {
 							$this->getDateOrTimeFormats($calendar->timeFormats, 'timeFormat', $data['calendars'][$calendarName]);
 						}
 
-						if(isset($calendar->dateTimeFormats)) {
+						if (isset($calendar->dateTimeFormats)) {
 							$dtf = $calendar->dateTimeFormats;
 							$data['calendars'][$calendarName]['dateTimeFormats']['default'] = isset($dtf->default) ? $dtf->default->getAttribute('choice') : '__default';
 
 							$dtfItems = $this->getChildsOrAlias($dtf);
-							foreach($dtfItems as $item) {
-								if($item->getName() == 'dateTimeFormatLength') {
-									if(isset($item->dateTimeFormat->pattern)) {
+							foreach ($dtfItems as $item) {
+								if ($item->getName() == 'dateTimeFormatLength') {
+									if (isset($item->dateTimeFormat->pattern)) {
 										$data['calendars'][$calendarName]['dateTimeFormats']['formats'][$item->getAttribute('type', '__default')] = $this->unescape($item->dateTimeFormat->pattern->getValue(), true);
 									} else {
 										throw new AgaviException('unknown child content in dateTimeFormatLength tag');
 									}
-								} elseif($item->getName() == 'availableFormats') {
-									foreach($item as $dateFormatItem) {
-										if($dateFormatItem->getName() != 'dateFormatItem') {
+								} elseif ($item->getName() == 'availableFormats') {
+									foreach ($item as $dateFormatItem) {
+										if ($dateFormatItem->getName() != 'dateFormatItem') {
 											throw new AgaviException('unknown childtag "' . $dateFormatItem->getName() . '" in availableFormats tag');
 										}
 										$data['calendars'][$calendarName]['dateTimeFormats']['availableFormats'][$dateFormatItem->getAttribute('id')] = $this->unescape($dateFormatItem->getValue(), true);
 									}
-								} elseif($item->getName() == 'appendItems') {
-									foreach($item as $appendItem) {
-										if($appendItem->getName() != 'appendItem') {
+								} elseif ($item->getName() == 'appendItems') {
+									foreach ($item as $appendItem) {
+										if ($appendItem->getName() != 'appendItem') {
 											throw new AgaviException('unknown childtag "' . $appendItem->getName() . '" in appendItems tag');
 										}
 										$data['calendars'][$calendarName]['dateTimeFormats']['appendItems'][$appendItem->getAttribute('request')] = $this->unescape($appendItem->getValue(), true);
 									}
-								} elseif($item->getName() != 'default') {
+								} elseif ($item->getName() != 'default') {
 									throw new AgaviException('unknown childtag "' . $item->getName() . '" in dateTimeFormats tag');
 								}
 							}
 						}
 
-						if(isset($calendar->fields)) {
-							foreach($this->getChildsOrAlias($calendar->fields) as $field) {
+						if (isset($calendar->fields)) {
+							foreach ($this->getChildsOrAlias($calendar->fields) as $field) {
 								$type = $field->getAttribute('type');
-								if(isset($field->displayName)) {
+								if (isset($field->displayName)) {
 									$data['calendars'][$calendarName]['fields'][$type]['displayName'] = $this->unescape($field->displayName->getValue());
 								}
-								if(isset($field->relative)) {
-									foreach($field as $relative) {
-										if($relative->getName() == 'relative') {
+								if (isset($field->relative)) {
+									foreach ($field as $relative) {
+										if ($relative->getName() == 'relative') {
 											$data['calendars'][$calendarName]['fields'][$type]['relatives'][$relative->getAttribute('type')] = $this->unescape($relative->getValue());
 										}
 									}
@@ -541,52 +541,52 @@ 
 				}
 			}
 			
-			if(isset($dates->timeZoneNames)) {
+			if (isset($dates->timeZoneNames)) {
 				$tzn = $dates->timeZoneNames;
-				if(isset($tzn->hourFormat)) {
+				if (isset($tzn->hourFormat)) {
 					$data['timeZoneNames']['hourFormat'] = $this->unescape($tzn->hourFormat->getValue());
 				}
-				if(isset($tzn->hoursFormat)) {
+				if (isset($tzn->hoursFormat)) {
 					$data['timeZoneNames']['hoursFormat'] = $this->unescape($tzn->hoursFormat->getValue());
 				}
-				if(isset($tzn->gmtFormat)) {
+				if (isset($tzn->gmtFormat)) {
 					$data['timeZoneNames']['gmtFormat'] = $this->unescape($tzn->gmtFormat->getValue());
 				}
-				if(isset($tzn->regionFormat)) {
+				if (isset($tzn->regionFormat)) {
 					$data['timeZoneNames']['regionFormat'] = $this->unescape($tzn->regionFormat->getValue());
 				}
-				if(isset($tzn->fallbackFormat)) {
+				if (isset($tzn->fallbackFormat)) {
 					$data['timeZoneNames']['fallbackFormat'] = $this->unescape($tzn->fallbackFormat->getValue());
 				}
-				if(isset($tzn->abbreviationFallback)) {
+				if (isset($tzn->abbreviationFallback)) {
 					$data['timeZoneNames']['abbreviationFallback'] = $tzn->abbreviationFallback->getAttribute('choice');
 				}
-				if(isset($tzn->singleCountries)) {
+				if (isset($tzn->singleCountries)) {
 					$data['timeZoneNames']['singleCountries'] = explode(' ', $tzn->singleCountries->getAttribute('list'));
 				}
 
-				foreach($tzn as $zone) {
+				foreach ($tzn as $zone) {
 					$zoneName = $zone->getAttribute('type');
-					if($zone->getName() == 'zone') {
-						if(isset($zone->long->generic)) {
+					if ($zone->getName() == 'zone') {
+						if (isset($zone->long->generic)) {
 							$data['timeZoneNames']['zones'][$zoneName]['long']['generic'] = $this->unescape($zone->long->generic->getValue());
 						}
-						if(isset($zone->long->standard)) {
+						if (isset($zone->long->standard)) {
 							$data['timeZoneNames']['zones'][$zoneName]['long']['standard'] = $this->unescape($zone->long->standard->getValue());
 						}
-						if(isset($zone->long->daylight)) {
+						if (isset($zone->long->daylight)) {
 							$data['timeZoneNames']['zones'][$zoneName]['long']['daylight'] = $this->unescape($zone->long->daylight->getValue());
 						}
-						if(isset($zone->short->generic)) {
+						if (isset($zone->short->generic)) {
 							$data['timeZoneNames']['zones'][$zoneName]['short']['generic'] = $this->unescape($zone->short->generic->getValue());
 						}
-						if(isset($zone->short->standard)) {
+						if (isset($zone->short->standard)) {
 							$data['timeZoneNames']['zones'][$zoneName]['short']['standard'] = $this->unescape($zone->short->standard->getValue());
 						}
-						if(isset($zone->short->daylight)) {
+						if (isset($zone->short->daylight)) {
 							$data['timeZoneNames']['zones'][$zoneName]['short']['daylight'] = $this->unescape($zone->short->daylight->getValue());
 						}
-						if(isset($zone->exemplarCity)) {
+						if (isset($zone->exemplarCity)) {
 							$data['timeZoneNames']['zones'][$zoneName]['exemplarCity'] = $this->unescape($zone->exemplarCity->getValue());
 						}
 
@@ -595,72 +595,72 @@ 
 			}
 		}
 
-		if(isset($ldmlTree->numbers)) {
+		if (isset($ldmlTree->numbers)) {
 			$nums = $ldmlTree->numbers;
-			if(!isset($data['numbers'])) {
+			if (!isset($data['numbers'])) {
 				$data['numbers'] = array();
 			}
 
-			if(isset($nums->symbols)) {
+			if (isset($nums->symbols)) {
 				$syms = $nums->symbols;
-				if(isset($syms->decimal)) {
+				if (isset($syms->decimal)) {
 					$data['numbers']['symbols']['decimal'] = $this->unescape($syms->decimal->getValue());
 				}
-				if(isset($syms->group)) {
+				if (isset($syms->group)) {
 					$data['numbers']['symbols']['group'] = $this->unescape($syms->group->getValue());
 				}
-				if(isset($syms->list)) {
+				if (isset($syms->list)) {
 					$data['numbers']['symbols']['list'] = $this->unescape($syms->list->getValue());
 				}
-				if(isset($syms->percentSign)) {
+				if (isset($syms->percentSign)) {
 					$data['numbers']['symbols']['percentSign'] = $this->unescape($syms->percentSign->getValue());
 				}
-				if(isset($syms->nativeZeroDigit)) {
+				if (isset($syms->nativeZeroDigit)) {
 					$data['numbers']['symbols']['nativeZeroDigit'] = $this->unescape($syms->nativeZeroDigit->getValue());
 				}
-				if(isset($syms->patternDigit)) {
+				if (isset($syms->patternDigit)) {
 					$data['numbers']['symbols']['patternDigit'] = $this->unescape($syms->patternDigit->getValue());
 				}
-				if(isset($syms->plusSign)) {
+				if (isset($syms->plusSign)) {
 					$data['numbers']['symbols']['plusSign'] = $this->unescape($syms->plusSign->getValue());
 				}
-				if(isset($syms->minusSign)) {
+				if (isset($syms->minusSign)) {
 					$data['numbers']['symbols']['minusSign'] = $this->unescape($syms->minusSign->getValue());
 				}
-				if(isset($syms->exponential)) {
+				if (isset($syms->exponential)) {
 					$data['numbers']['symbols']['exponential'] = $this->unescape($syms->exponential->getValue());
 				}
-				if(isset($syms->perMille)) {
+				if (isset($syms->perMille)) {
 					$data['numbers']['symbols']['perMille'] = $this->unescape($syms->perMille->getValue());
 				}
-				if(isset($syms->infinity)) {
+				if (isset($syms->infinity)) {
 					$data['numbers']['symbols']['infinity'] = $this->unescape($syms->infinity->getValue());
 				}
-				if(isset($syms->nan)) {
+				if (isset($syms->nan)) {
 					$data['numbers']['symbols']['nan'] = $this->unescape($syms->nan->getValue());
 				}
 			}
-			if(isset($nums->decimalFormats)) {
+			if (isset($nums->decimalFormats)) {
 				$this->getNumberFormats($nums->decimalFormats, 'decimalFormat', $data['numbers']);
 			}
-			if(isset($nums->scientificFormats)) {
+			if (isset($nums->scientificFormats)) {
 				$this->getNumberFormats($nums->scientificFormats, 'scientificFormat', $data['numbers']);
 			}
-			if(isset($nums->percentFormats)) {
+			if (isset($nums->percentFormats)) {
 				$this->getNumberFormats($nums->percentFormats, 'percentFormat', $data['numbers']);
 			}
-			if(isset($nums->currencyFormats)) {
+			if (isset($nums->currencyFormats)) {
 				$cf = $nums->currencyFormats;
 
-				foreach($this->getChildsOrAlias($cf) as $itemLength) {
-					if($itemLength->getName() == 'default') {
+				foreach ($this->getChildsOrAlias($cf) as $itemLength) {
+					if ($itemLength->getName() == 'default') {
 						$data['numbers']['currencyFormats']['default'] = $itemLength->getAttribute('choice');
-					} elseif($itemLength->getName() == 'currencyFormatLength') {
+					} elseif ($itemLength->getName() == 'currencyFormatLength') {
 						$itemLengthName = $itemLength->getAttribute('type', '__default');
 
-						foreach($this->getChildsOrAlias($itemLength) as $itemFormat) {
-							if($itemFormat->getName() == 'currencyFormat') {
-								if(isset($itemFormat->pattern)) {
+						foreach ($this->getChildsOrAlias($itemLength) as $itemFormat) {
+							if ($itemFormat->getName() == 'currencyFormat') {
+								if (isset($itemFormat->pattern)) {
 									$data['numbers']['currencyFormats'][$itemLengthName] = $this->unescape($itemFormat->pattern->getValue());
 								}
 							} else {
@@ -668,24 +668,24 @@ 
 							}
 
 						}
-					} elseif($itemLength->getName() == 'currencySpacing') {
+					} elseif ($itemLength->getName() == 'currencySpacing') {
 
-						if(isset($itemLength->beforeCurrency->currencyMatch)) {
+						if (isset($itemLength->beforeCurrency->currencyMatch)) {
 							$data['numbers']['currencySpacing']['beforeCurrency']['currencyMatch'] = $this->unescape($itemLength->beforeCurrency->currencyMatch->getValue());
 						}
-						if(isset($itemLength->beforeCurrency->surroundingMatch)) {
+						if (isset($itemLength->beforeCurrency->surroundingMatch)) {
 							$data['numbers']['currencySpacing']['beforeCurrency']['surroundingMatch'] = $this->unescape($itemLength->beforeCurrency->surroundingMatch->getValue());
 						}
-						if(isset($itemLength->beforeCurrency->insertBetween)) {
+						if (isset($itemLength->beforeCurrency->insertBetween)) {
 							$data['numbers']['currencySpacing']['beforeCurrency']['insertBetween'] = $this->unescape($itemLength->beforeCurrency->insertBetween->getValue());
 						}
-						if(isset($itemLength->afterCurrency->currencyMatch)) {
+						if (isset($itemLength->afterCurrency->currencyMatch)) {
 							$data['numbers']['currencySpacing']['afterCurrency']['currencyMatch'] = $this->unescape($itemLength->afterCurrency->currencyMatch->getValue());
 						}
-						if(isset($itemLength->afterCurrency->surroundingMatch)) {
+						if (isset($itemLength->afterCurrency->surroundingMatch)) {
 							$data['numbers']['currencySpacing']['afterCurrency']['surroundingMatch'] = $this->unescape($itemLength->afterCurrency->surroundingMatch->getValue());
 						}
-						if(isset($itemLength->afterCurrency->insertBetween)) {
+						if (isset($itemLength->afterCurrency->insertBetween)) {
 							$data['numbers']['currencySpacing']['afterCurrency']['insertBetween'] = $this->unescape($itemLength->afterCurrency->insertBetween->getValue());
 						}
 
@@ -694,15 +694,15 @@ 
 					}
 				}
 			}
-			if(isset($nums->currencies)) {
-				foreach($nums->currencies as $currency) {
+			if (isset($nums->currencies)) {
+				foreach ($nums->currencies as $currency) {
 					$name = $currency->getAttribute('type');
-					if(isset($currency->displayName)) {
+					if (isset($currency->displayName)) {
 						$data['numbers']['currencies'][$name]['displayName'] = $this->unescape($currency->displayName->getValue());
 					}
-					if(isset($currency->symbol)) {
+					if (isset($currency->symbol)) {
 						$symbolValue = $this->unescape($currency->symbol->getValue());
-						if($currency->symbol->getAttribute('choice') == 'true') {
+						if ($currency->symbol->getAttribute('choice') == 'true') {
 							$symbolValue = explode('|', $symbolValue);
 						}
 						$data['numbers']['currencies'][$name]['symbol'] = $symbolValue;
@@ -729,17 +729,17 @@ 
 	{
 		// debug stuff to check if we missed any tags (lc = loop count)
 		$lc = 0;
-		foreach($list as $listItem) {
+		foreach ($list as $listItem) {
 			$type = $listItem->getAttribute('type');
 
-			if(!$listItem->hasAttribute('alt')) {
+			if (!$listItem->hasAttribute('alt')) {
 				$data[$type] = $this->unescape($listItem->getValue());
 			}
 
 			++$lc;
 		}
 
-		if($lc != count($list->getChildren())) {
+		if ($lc != count($list->getChildren())) {
 			throw new AgaviException('wrong tagcount');
 		}
 
@@ -763,25 +763,25 @@ 
 		$dataIdxName = $name . 's';
 
 		$items = $this->getChildsOrAlias($item);
-		foreach($items as $itemContext) {
-			if($itemContext->getName() == 'default') {
+		foreach ($items as $itemContext) {
+			if ($itemContext->getName() == 'default') {
 				$data[$dataIdxName]['default'] = $itemContext->getAttribute('choice');
-			} elseif($itemContext->getName() == $name . 'Context') {
+			} elseif ($itemContext->getName() == $name . 'Context') {
 				$itemContextName = $itemContext->getAttribute('type');
 
-				foreach($itemContext as $itemWidths) {
-					if($itemWidths->getName() == 'default') {
+				foreach ($itemContext as $itemWidths) {
+					if ($itemWidths->getName() == 'default') {
 						$data[$dataIdxName][$itemContextName]['default'] = $itemWidths->getAttribute('choice');
-					} elseif($itemWidths->getName() == $name . 'Width') {
+					} elseif ($itemWidths->getName() == $name . 'Width') {
 						$itemWidthName = $itemWidths->getAttribute('type');
 
 						$widthChildItems = $this->getChildsOrAlias($itemWidths);
-						foreach($widthChildItems as $item) {
-							if($item->getName() != $name) {
+						foreach ($widthChildItems as $item) {
+							if ($item->getName() != $name) {
 								throw new AgaviException('unknown childtag "' . $item->getName() . '" in ' . $name . 'Widths tag');
 							}
 
-							if(!$item->hasAttribute('alt')) {
+							if (!$item->hasAttribute('alt')) {
 								$itemName = $item->getAttribute('type');
 								$data[$dataIdxName][$itemContextName][$itemWidthName][$itemName] = $this->unescape($item->getValue());
 							}
@@ -814,19 +814,19 @@ 
 		$dataIdxName = $name . 's';
 
 		$items = $this->getChildsOrAlias($item);
-		foreach($items as $itemLength) {
-			if($itemLength->getName() == 'default') {
+		foreach ($items as $itemLength) {
+			if ($itemLength->getName() == 'default') {
 				$data[$dataIdxName]['default'] = $itemLength->getAttribute('choice');
-			} elseif($itemLength->getName() == $name . 'Length') {
+			} elseif ($itemLength->getName() == $name . 'Length') {
 				$itemLengthName = $itemLength->getAttribute('type', '__default');
 
 				$aliasedItemLength = $this->getChildsOrAlias($itemLength);
-				foreach($aliasedItemLength as $itemFormat) {
-					if($itemFormat->getName() == $name) {
-						if(isset($itemFormat->pattern)) {
+				foreach ($aliasedItemLength as $itemFormat) {
+					if ($itemFormat->getName() == $name) {
+						if (isset($itemFormat->pattern)) {
 							$data[$dataIdxName][$itemLengthName]['pattern'] = $this->unescape($itemFormat->pattern->getValue(), true);
 						}
-						if(isset($itemFormat->displayName)) {
+						if (isset($itemFormat->displayName)) {
 							$data[$dataIdxName][$itemLengthName]['displayName'] = $this->unescape($itemFormat->displayName->getValue());
 						}
 					} else {
@@ -857,15 +857,15 @@ 
 		$dataIdxName = $name . 's';
 
 		$items = $this->getChildsOrAlias($item);
-		foreach($items as $itemLength) {
-			if($itemLength->getName() == 'default') {
+		foreach ($items as $itemLength) {
+			if ($itemLength->getName() == 'default') {
 				$data[$dataIdxName]['default'] = $itemLength->getAttribute('choice');
-			} elseif($itemLength->getName() == $name . 'Length') {
+			} elseif ($itemLength->getName() == $name . 'Length') {
 				$itemLengthName = $itemLength->getAttribute('type', '__default');
 
-				foreach($this->getChildsOrAlias($itemLength) as $itemFormat) {
-					if($itemFormat->getName() == $name) {
-						if(isset($itemFormat->pattern)) {
+				foreach ($this->getChildsOrAlias($itemLength) as $itemFormat) {
+					if ($itemFormat->getName() == $name) {
+						if (isset($itemFormat->pattern)) {
 							$data[$dataIdxName][$itemLengthName] = $this->unescape($itemFormat->pattern->getValue());
 						}
 					} else {
@@ -892,9 +892,9 @@ 
 	 */
 	protected function getChildsOrAlias(ConfigValueHolder $item)
 	{
-		if(isset($item->alias)) {
+		if (isset($item->alias)) {
 			$alias = $item->alias;
-			if($alias->getAttribute('source') != 'locale') {
+			if ($alias->getAttribute('source') != 'locale') {
 				throw new AgaviException('The alias handling doesn\'t support any source except locale (' . $alias->getAttribute('source') . ' was given)');
 			}
 
@@ -902,14 +902,14 @@ 
 
 			$currentNodeId = $item->getAttribute('__agavi_node_id');
 			
-			foreach($pathParts as $part) {
+			foreach ($pathParts as $part) {
 				// select the parent node
-				if($part == '..') {
+				if ($part == '..') {
 					$currentNodeId = $this->nodeRefs[$currentNodeId]->getAttribute('__agavi_parent_id');
 				} else {
 					$predicates = array();
-					if(preg_match('#([^\[]+)\[([^\]]+)\]#', $part, $match)) {
-						if(!preg_match('#@([^=]+)=\'([^\']+)\'#', $match[2], $predMatch)) {
+					if (preg_match('#([^\[]+)\[([^\]]+)\]#', $part, $match)) {
+						if (!preg_match('#@([^=]+)=\'([^\']+)\'#', $match[2], $predMatch)) {
 							throw new AgaviException('Unknown predicate ' . $match[2] . ' in alias xpath spec');
 						}
 						$tagName = $match[1];
@@ -917,21 +917,21 @@ 
 					} else {
 						$tagName = $part;
 					}
-					foreach($this->nodeRefs[$currentNodeId]->getChildren() as $childNode) {
+					foreach ($this->nodeRefs[$currentNodeId]->getChildren() as $childNode) {
 						$isSearchedNode = false;
-						if($childNode->getName() == $tagName) {
+						if ($childNode->getName() == $tagName) {
 							$predMatches = 0;
-							foreach($predicates as $attrib => $value) {
-								if($childNode->getAttribute($attrib) == $value) {
+							foreach ($predicates as $attrib => $value) {
+								if ($childNode->getAttribute($attrib) == $value) {
 									++$predMatches;
 								}
 							}
-							if($predMatches == count($predicates)) {
+							if ($predMatches == count($predicates)) {
 								$isSearchedNode = true;
 							}
 						}
 
-						if($isSearchedNode) {
+						if ($isSearchedNode) {
 							$currentNodeId = $childNode->getAttribute('__agavi_node_id');
 						}
 					}
@@ -961,18 +961,18 @@ 
 	{
 		$output = '';
 		$hex = '[0-9A-Fa-f]';
-		$rx = '\\\\(\\\\|u' . $hex . '{4}|U' . $hex . '{8}|x' . $hex .'{1,2}|[0-7]{1,3}|.)';
-		if($handleQuotes) {
+		$rx = '\\\\(\\\\|u' . $hex . '{4}|U' . $hex . '{8}|x' . $hex . '{1,2}|[0-7]{1,3}|.)';
+		if ($handleQuotes) {
 			// needs to be < -1 to not confuse the algorithm in the first run
 			$lastClose = -2;
-			if(preg_match_all("#'(?:''|[^'])+'|" . $rx . "#", $input, $matches, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE)) {
+			if (preg_match_all("#'(?:''|[^'])+'|" . $rx . "#", $input, $matches, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE)) {
 				$output = $input;
 				$offsetMod = 0;
 				$ml = $matches[0];
 				$len = count($ml);
-				for($i = 0; $i < $len; ++ $i) {
+				for ($i = 0; $i < $len; ++ $i) {
 					$match = $ml[$i];
-					if($match[0][0] != '\'') {
+					if ($match[0][0] != '\'') {
 						// we check if there is a quoted string directly before or directly after the escape sequence
 						// by using the string lengths and the offset of the matches. Since an escape sequence directly before
 						// this sequence results in an quoted string we only check if its really a quoted string and not an
@@ -982,7 +982,7 @@ 
 						$oldLen = strlen($output);
 						$unescaped = $this->unescapeCallback(array($match[0], substr($match[0], 1)));
 						$unescaped = ($quoteBefore ? '' : '\'') . $unescaped . ($quoteAfter ? '' : '\'');
-						$replacedPartLen = strlen($match[0]) + ((int) $quoteBefore) + ((int) $quoteAfter);
+						$replacedPartLen = strlen($match[0]) + ((int)$quoteBefore) + ((int)$quoteAfter);
 						// replace the matched escape sequence with the unescaped one. we also replace the opening or closing quote
 						// from the quoted part before or after this escape sequence to include the unescaped string into the closed part
 						$output = substr_replace($output, $unescaped, $offsetMod + $match[1] + ($quoteBefore ? -1 : 0), $replacedPartLen);
@@ -1029,11 +1029,11 @@ 
 		
 		$char = $matches[1][0];
 		$seq = substr($matches[1], 1);
-		if($char == 'u' || $char == 'U' || $char == 'x') {
+		if ($char == 'u' || $char == 'U' || $char == 'x') {
 			$res = html_entity_decode('&#x' . $seq . ';', ENT_QUOTES, 'utf-8');
-		} elseif(is_numeric($char)) {
+		} elseif (is_numeric($char)) {
 			$res = html_entity_decode('&#' . octdec($matches[1]) . ';', ENT_QUOTES, 'utf-8');
-		} elseif(isset($map[$char])) {
+		} elseif (isset($map[$char])) {
 			$res = $map[$char];
 		} else {
 			$res = $char; // something like \s or \0 or so, just return the character ("s" or "0")

Indentation +821 added lines, -821 removed lines

@@ -34,135 +34,135 @@ 
  */
 class LdmlConfigHandler extends ConfigHandler
 {
-	protected $nodeRefs = array();
-
-	/**
-	 * Execute this configuration handler.
-	 *
-	 * @param      string $config  An absolute filesystem path to a configuration file.
-	 * @param      string $context An optional context in which we are currently running.
-	 *
-	 * @return     string Data to be written to a cache file.
-	 *
-	 * @throws     <b>AgaviUnreadableException</b> If a requested configuration
-	 *                                             file does not exist or is not
-	 *                                             readable.
-	 * @throws     <b>AgaviParseException</b> If a requested configuration file is
-	 *                                        improperly formatted.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function execute($config, $context = null)
-	{
-		$pathParts = pathinfo($config);
-		// unlike basename, filename does not contain the extension, which is what we need there
-		$lookupPaths = Locale::getLookupPath($pathParts['filename']);
-		$lookupPaths[] = 'root';
-
-		$data = array(
-			'layout' => array('orientation' => array('lines' => 'top-to-bottom', 'characters' => 'left-to-right')),
-		);
-
-		foreach(array_reverse($lookupPaths) as $basename) {
-			$filePath = $pathParts['dirname'] . '/' . $basename . '.' . $pathParts['extension'];
-			if(is_readable($filePath)) {
-				$ldmlTree = ConfigCache::parseConfig($filePath, false, $this->getValidationFile(), $this->parser);
-				$this->prepareParentInformation($ldmlTree);
-				$this->parseLdmlTree($ldmlTree->ldml, $data);
-			}
-		}
-
-		$dayMap = array(
-										'sun' => DateDefinitions::SUNDAY,
-										'mon' => DateDefinitions::MONDAY,
-										'tue' => DateDefinitions::TUESDAY,
-										'wed' => DateDefinitions::WEDNESDAY,
-										'thu' => DateDefinitions::THURSDAY,
-										'fri' => DateDefinitions::FRIDAY,
-										'sat' => DateDefinitions::SATURDAY,
-		);
-
-		// fix the day indices for all day fields
-		foreach($data['calendars'] as $calKey => &$calValue) {
-			// skip the 'default' => '' key => value pair
-			if(is_array($calValue)) {
-				if(isset($calValue['days']['format'])) {
-					foreach($calValue['days']['format'] as $formatKey => &$formatValue) {
-						if(is_array($formatValue)) {
-							$newData = array();
-							foreach($formatValue as $day => $value) {
-								$newData[$dayMap[$day]] = $value;
-							}
-							$formatValue = $newData;
-						}
-					}
-				}
-
-				if(isset($calValue['days']['stand-alone'])) {
-					foreach($calValue['days']['stand-alone'] as $formatKey => &$formatValue) {
-						if(is_array($formatValue)) {
-							$newData = array();
-							foreach($formatValue as $day => $value) {
-								$newData[$dayMap[$day]] = $value;
-							}
-							$formatValue = $newData;
-						}
-					}
-				}
-			}
-		}
-
-		$code = array();
-		$code[] = 'return ' . var_export($data, true) . ';';
-
-		return $this->generate($code, $config);
-	}
-
-	/**
-	 * Prepares the parent information for the given ldml tree.
-	 *
-	 * @param      ConfigValueHolder $ldmlTree The ldml tree.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	protected function prepareParentInformation($ldmlTree)
-	{
-		$this->nodeRefs = array();
-		$i = 0;
-		$ldmlTree->setAttribute('__agavi_node_id', $i);
-		$ldmlTree->setAttribute('__agavi_parent_id', null);
-		$this->nodeRefs[$i] = $ldmlTree;
-		++$i;
-		if($ldmlTree->hasChildren()) {
-			$this->generateParentInformation($ldmlTree->getChildren(), $i, 0);
-		}
-	}
-
-	/**
-	 * Generates the parent information for the given ldml subtree.
-	 *
-	 * @param      ConfigValueHolder[] $childList The ldml node.
-	 * @param	   int                 $nextId
-	 * @param      int                 $parentId
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	protected function generateParentInformation($childList, &$nextId, $parentId)
-	{
-		/** @var ConfigValueHolder $child */
-		foreach($childList as $child) {
-			$child->setAttribute('__agavi_node_id', $nextId);
-			$child->setAttribute('__agavi_parent_id', $parentId);
-			$this->nodeRefs[$nextId] = $child;
-			++$nextId;
-			if($child->hasChildren()) {
-				$this->generateParentInformation($child->getChildren(), $nextId, $child->getAttribute('__agavi_node_id'));
-			}
-		}
-	}
+    protected $nodeRefs = array();
+
+    /**
+     * Execute this configuration handler.
+     *
+     * @param      string $config  An absolute filesystem path to a configuration file.
+     * @param      string $context An optional context in which we are currently running.
+     *
+     * @return     string Data to be written to a cache file.
+     *
+     * @throws     <b>AgaviUnreadableException</b> If a requested configuration
+     *                                             file does not exist or is not
+     *                                             readable.
+     * @throws     <b>AgaviParseException</b> If a requested configuration file is
+     *                                        improperly formatted.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function execute($config, $context = null)
+    {
+        $pathParts = pathinfo($config);
+        // unlike basename, filename does not contain the extension, which is what we need there
+        $lookupPaths = Locale::getLookupPath($pathParts['filename']);
+        $lookupPaths[] = 'root';
+
+        $data = array(
+            'layout' => array('orientation' => array('lines' => 'top-to-bottom', 'characters' => 'left-to-right')),
+        );
+
+        foreach(array_reverse($lookupPaths) as $basename) {
+            $filePath = $pathParts['dirname'] . '/' . $basename . '.' . $pathParts['extension'];
+            if(is_readable($filePath)) {
+                $ldmlTree = ConfigCache::parseConfig($filePath, false, $this->getValidationFile(), $this->parser);
+                $this->prepareParentInformation($ldmlTree);
+                $this->parseLdmlTree($ldmlTree->ldml, $data);
+            }
+        }
+
+        $dayMap = array(
+                                        'sun' => DateDefinitions::SUNDAY,
+                                        'mon' => DateDefinitions::MONDAY,
+                                        'tue' => DateDefinitions::TUESDAY,
+                                        'wed' => DateDefinitions::WEDNESDAY,
+                                        'thu' => DateDefinitions::THURSDAY,
+                                        'fri' => DateDefinitions::FRIDAY,
+                                        'sat' => DateDefinitions::SATURDAY,
+        );
+
+        // fix the day indices for all day fields
+        foreach($data['calendars'] as $calKey => &$calValue) {
+            // skip the 'default' => '' key => value pair
+            if(is_array($calValue)) {
+                if(isset($calValue['days']['format'])) {
+                    foreach($calValue['days']['format'] as $formatKey => &$formatValue) {
+                        if(is_array($formatValue)) {
+                            $newData = array();
+                            foreach($formatValue as $day => $value) {
+                                $newData[$dayMap[$day]] = $value;
+                            }
+                            $formatValue = $newData;
+                        }
+                    }
+                }
+
+                if(isset($calValue['days']['stand-alone'])) {
+                    foreach($calValue['days']['stand-alone'] as $formatKey => &$formatValue) {
+                        if(is_array($formatValue)) {
+                            $newData = array();
+                            foreach($formatValue as $day => $value) {
+                                $newData[$dayMap[$day]] = $value;
+                            }
+                            $formatValue = $newData;
+                        }
+                    }
+                }
+            }
+        }
+
+        $code = array();
+        $code[] = 'return ' . var_export($data, true) . ';';
+
+        return $this->generate($code, $config);
+    }
+
+    /**
+     * Prepares the parent information for the given ldml tree.
+     *
+     * @param      ConfigValueHolder $ldmlTree The ldml tree.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    protected function prepareParentInformation($ldmlTree)
+    {
+        $this->nodeRefs = array();
+        $i = 0;
+        $ldmlTree->setAttribute('__agavi_node_id', $i);
+        $ldmlTree->setAttribute('__agavi_parent_id', null);
+        $this->nodeRefs[$i] = $ldmlTree;
+        ++$i;
+        if($ldmlTree->hasChildren()) {
+            $this->generateParentInformation($ldmlTree->getChildren(), $i, 0);
+        }
+    }
+
+    /**
+     * Generates the parent information for the given ldml subtree.
+     *
+     * @param      ConfigValueHolder[] $childList The ldml node.
+     * @param	   int                 $nextId
+     * @param      int                 $parentId
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    protected function generateParentInformation($childList, &$nextId, $parentId)
+    {
+        /** @var ConfigValueHolder $child */
+        foreach($childList as $child) {
+            $child->setAttribute('__agavi_node_id', $nextId);
+            $child->setAttribute('__agavi_parent_id', $parentId);
+            $this->nodeRefs[$nextId] = $child;
+            ++$nextId;
+            if($child->hasChildren()) {
+                $this->generateParentInformation($child->getChildren(), $nextId, $child->getAttribute('__agavi_node_id'));
+            }
+        }
+    }
 
 /*
 
@@ -336,711 +336,711 @@ 
 			
 */
 
-	/**
-	 * Generates the array used by AgaviLocale from an LDML tree.
-	 *
-	 * @param      ConfigValueHolder $ldmlTree The ldml tree.
-	 * @param      array             $data     The array to store the parsed data to.
-	 *
-	 * @return     array The array with the data.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function parseLdmlTree($ldmlTree, &$data)
-	{
-
-		if(isset($ldmlTree->identity)) {
-			$data['locale']['language'] = $ldmlTree->identity->language->getAttribute('type');
-			if(isset($ldmlTree->identity->territory)) {
-				$data['locale']['territory'] = $ldmlTree->identity->territory->getAttribute('type');
-			}
-			if(isset($ldmlTree->identity->script)) {
-				$data['locale']['script'] = $ldmlTree->identity->script->getAttribute('type');
-			}
-			if(isset($ldmlTree->identity->variant)) {
-				$data['locale']['variant'] = $ldmlTree->identity->variant->getAttribute('type');
-			}
-		}
-
-		if(isset($ldmlTree->localeDisplayNames)) {
-			$ldn = $ldmlTree->localeDisplayNames;
-
-			if(isset($ldn->languages)) {
-				$data['displayNames']['languages'] = isset($data['displayNames']['languages']) ? $data['displayNames']['languages'] : array();
-				$this->getTypeList($ldn->languages, $data['displayNames']['languages']);
-			}
-
-			if(isset($ldn->scripts)) {
-				$data['displayNames']['scripts'] = isset($data['displayNames']['scripts']) ? $data['displayNames']['scripts'] : array();
-				$this->getTypeList($ldn->scripts, $data['displayNames']['scripts']);
-			}
-
-			if(isset($ldn->territories)) {
-				$data['displayNames']['territories'] = isset($data['displayNames']['territories']) ? $data['displayNames']['territories'] : array();
-				$this->getTypeList($ldn->territories, $data['displayNames']['territories']);
-			}
-
-			if(isset($ldn->variants)) {
-				$data['displayNames']['variants'] = isset($data['displayNames']['variants']) ? $data['displayNames']['variants'] : array();
-				$this->getTypeList($ldn->variants, $data['displayNames']['variants']);
-			}
-
-			if(isset($ldn->keys)) {
-				$data['displayNames']['keys'] = isset($data['displayNames']['keys']) ? $data['displayNames']['keys'] : array();
-				$this->getTypeList($ldn->keys, $data['displayNames']['keys']);
-			}
-
-			/*
+    /**
+     * Generates the array used by AgaviLocale from an LDML tree.
+     *
+     * @param      ConfigValueHolder $ldmlTree The ldml tree.
+     * @param      array             $data     The array to store the parsed data to.
+     *
+     * @return     array The array with the data.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function parseLdmlTree($ldmlTree, &$data)
+    {
+
+        if(isset($ldmlTree->identity)) {
+            $data['locale']['language'] = $ldmlTree->identity->language->getAttribute('type');
+            if(isset($ldmlTree->identity->territory)) {
+                $data['locale']['territory'] = $ldmlTree->identity->territory->getAttribute('type');
+            }
+            if(isset($ldmlTree->identity->script)) {
+                $data['locale']['script'] = $ldmlTree->identity->script->getAttribute('type');
+            }
+            if(isset($ldmlTree->identity->variant)) {
+                $data['locale']['variant'] = $ldmlTree->identity->variant->getAttribute('type');
+            }
+        }
+
+        if(isset($ldmlTree->localeDisplayNames)) {
+            $ldn = $ldmlTree->localeDisplayNames;
+
+            if(isset($ldn->languages)) {
+                $data['displayNames']['languages'] = isset($data['displayNames']['languages']) ? $data['displayNames']['languages'] : array();
+                $this->getTypeList($ldn->languages, $data['displayNames']['languages']);
+            }
+
+            if(isset($ldn->scripts)) {
+                $data['displayNames']['scripts'] = isset($data['displayNames']['scripts']) ? $data['displayNames']['scripts'] : array();
+                $this->getTypeList($ldn->scripts, $data['displayNames']['scripts']);
+            }
+
+            if(isset($ldn->territories)) {
+                $data['displayNames']['territories'] = isset($data['displayNames']['territories']) ? $data['displayNames']['territories'] : array();
+                $this->getTypeList($ldn->territories, $data['displayNames']['territories']);
+            }
+
+            if(isset($ldn->variants)) {
+                $data['displayNames']['variants'] = isset($data['displayNames']['variants']) ? $data['displayNames']['variants'] : array();
+                $this->getTypeList($ldn->variants, $data['displayNames']['variants']);
+            }
+
+            if(isset($ldn->keys)) {
+                $data['displayNames']['keys'] = isset($data['displayNames']['keys']) ? $data['displayNames']['keys'] : array();
+                $this->getTypeList($ldn->keys, $data['displayNames']['keys']);
+            }
+
+            /*
 			// not needed right now
 			if(isset($ldn->types)) {
 			}
 			*/
 
-			if(isset($ldn->measurementSystemNames)) {
-				$data['displayNames']['measurementSystemNames'] = isset($data['displayNames']['measurementSystemNames']) ? $data['displayNames']['measurementSystemNames'] : array();
-				$this->getTypeList($ldn->measurementSystemNames, $data['displayNames']['measurementSystemNames']);
-			}
-		}
-
-		if(isset($ldmlTree->layout->orientation)) {
-			$ori = $ldmlTree->layout->orientation;
-
-			$data['layout']['orientation']['lines'] = $ori->getAttribute('lines', $data['layout']['orientation']['lines']);
-			$data['layout']['orientation']['characters'] = $ori->getAttribute('characters', $data['layout']['orientation']['characters']);
-		}
-
-		if(isset($ldmlTree->delimiters)) {
-			$delims = $ldmlTree->delimiters;
-
-			if(isset($delims->quotationStart)) {
-				$data['delimiters']['quotationStart'] = $this->unescape($delims->quotationStart->getValue());
-			}
-			if(isset($delims->quotationEnd)) {
-				$data['delimiters']['quotationEnd'] = $this->unescape($delims->quotationEnd->getValue());
-			}
-			if(isset($delims->alternateQuotationStart)) {
-				$data['delimiters']['alternateQuotationStart'] = $this->unescape($delims->alternateQuotationStart->getValue());
-			}
-			if(isset($delims->alternateQuotationEnd)) {
-				$data['delimiters']['alternateQuotationEnd'] = $this->unescape($delims->alternateQuotationEnd->getValue());
-			}
-		}
-
-		if(isset($ldmlTree->dates)) {
-			$dates = $ldmlTree->dates;
-
-			if(isset($dates->calendars)) {
-				$cals = $dates->calendars;
-
-				foreach($cals as $calendar) {
-
-					if($calendar->getName() == 'default') {
-						$data['calendars']['default'] = $calendar->getAttribute('choice');
-					} elseif($calendar->getName() == 'calendar') {
-						$calendarName = $calendar->getAttribute('type');
-
-						if(!isset($data['calendars'][$calendarName])) {
-							$data['calendars'][$calendarName] = array();
-						}
-
-						if(isset($calendar->months)) {
-							$this->getCalendarWidth($calendar->months, 'month', $data['calendars'][$calendarName]);
-						}
-
-						if(isset($calendar->days)) {
-							$this->getCalendarWidth($calendar->days, 'day', $data['calendars'][$calendarName]);
-						}
-
-						if(isset($calendar->quarters)) {
-							$this->getCalendarWidth($calendar->quarters, 'quarter', $data['calendars'][$calendarName]);
-						}
-
-						if(isset($calendar->am)) {
-							$data['calendars'][$calendarName]['am'] = $this->unescape($calendar->am->getValue());
-						}
-						if(isset($calendar->pm)) {
-							$data['calendars'][$calendarName]['pm'] = $this->unescape($calendar->pm->getValue());
-						}
-
-						if(isset($calendar->eras)) {
-							if(isset($calendar->eras->eraNames)) {
-								foreach($this->getChildsOrAlias($calendar->eras->eraNames) as $era) {
-									$data['calendars'][$calendarName]['eras']['wide'][$era->getAttribute('type')] = $this->unescape($era->getValue());
-								}
-							}
-							if(isset($calendar->eras->eraAbbr)) {
-								foreach($this->getChildsOrAlias($calendar->eras->eraAbbr) as $era) {
-									$data['calendars'][$calendarName]['eras']['abbreviated'][$era->getAttribute('type')] = $this->unescape($era->getValue());
-								}
-							}
-							if(isset($calendar->eras->eraNarrow)) {
-								foreach($this->getChildsOrAlias($calendar->eras->eraNarrow) as $era) {
-									$data['calendars'][$calendarName]['eras']['narrow'][$era->getAttribute('type')] = $this->unescape($era->getValue());
-								}
-							}
-						}
-
-						if(isset($calendar->dateFormats)) {
-							$this->getDateOrTimeFormats($calendar->dateFormats, 'dateFormat', $data['calendars'][$calendarName]);
-						}
-						if(isset($calendar->timeFormats)) {
-							$this->getDateOrTimeFormats($calendar->timeFormats, 'timeFormat', $data['calendars'][$calendarName]);
-						}
-
-						if(isset($calendar->dateTimeFormats)) {
-							$dtf = $calendar->dateTimeFormats;
-							$data['calendars'][$calendarName]['dateTimeFormats']['default'] = isset($dtf->default) ? $dtf->default->getAttribute('choice') : '__default';
-
-							$dtfItems = $this->getChildsOrAlias($dtf);
-							foreach($dtfItems as $item) {
-								if($item->getName() == 'dateTimeFormatLength') {
-									if(isset($item->dateTimeFormat->pattern)) {
-										$data['calendars'][$calendarName]['dateTimeFormats']['formats'][$item->getAttribute('type', '__default')] = $this->unescape($item->dateTimeFormat->pattern->getValue(), true);
-									} else {
-										throw new AgaviException('unknown child content in dateTimeFormatLength tag');
-									}
-								} elseif($item->getName() == 'availableFormats') {
-									foreach($item as $dateFormatItem) {
-										if($dateFormatItem->getName() != 'dateFormatItem') {
-											throw new AgaviException('unknown childtag "' . $dateFormatItem->getName() . '" in availableFormats tag');
-										}
-										$data['calendars'][$calendarName]['dateTimeFormats']['availableFormats'][$dateFormatItem->getAttribute('id')] = $this->unescape($dateFormatItem->getValue(), true);
-									}
-								} elseif($item->getName() == 'appendItems') {
-									foreach($item as $appendItem) {
-										if($appendItem->getName() != 'appendItem') {
-											throw new AgaviException('unknown childtag "' . $appendItem->getName() . '" in appendItems tag');
-										}
-										$data['calendars'][$calendarName]['dateTimeFormats']['appendItems'][$appendItem->getAttribute('request')] = $this->unescape($appendItem->getValue(), true);
-									}
-								} elseif($item->getName() != 'default') {
-									throw new AgaviException('unknown childtag "' . $item->getName() . '" in dateTimeFormats tag');
-								}
-							}
-						}
-
-						if(isset($calendar->fields)) {
-							foreach($this->getChildsOrAlias($calendar->fields) as $field) {
-								$type = $field->getAttribute('type');
-								if(isset($field->displayName)) {
-									$data['calendars'][$calendarName]['fields'][$type]['displayName'] = $this->unescape($field->displayName->getValue());
-								}
-								if(isset($field->relative)) {
-									foreach($field as $relative) {
-										if($relative->getName() == 'relative') {
-											$data['calendars'][$calendarName]['fields'][$type]['relatives'][$relative->getAttribute('type')] = $this->unescape($relative->getValue());
-										}
-									}
-								}
-							}
-						}
-					} else {
-						throw new AgaviException('unknown childtag "' . $calendar->getName() . '" in calendars tag');
-					}
-				}
-			}
+            if(isset($ldn->measurementSystemNames)) {
+                $data['displayNames']['measurementSystemNames'] = isset($data['displayNames']['measurementSystemNames']) ? $data['displayNames']['measurementSystemNames'] : array();
+                $this->getTypeList($ldn->measurementSystemNames, $data['displayNames']['measurementSystemNames']);
+            }
+        }
+
+        if(isset($ldmlTree->layout->orientation)) {
+            $ori = $ldmlTree->layout->orientation;
+
+            $data['layout']['orientation']['lines'] = $ori->getAttribute('lines', $data['layout']['orientation']['lines']);
+            $data['layout']['orientation']['characters'] = $ori->getAttribute('characters', $data['layout']['orientation']['characters']);
+        }
+
+        if(isset($ldmlTree->delimiters)) {
+            $delims = $ldmlTree->delimiters;
+
+            if(isset($delims->quotationStart)) {
+                $data['delimiters']['quotationStart'] = $this->unescape($delims->quotationStart->getValue());
+            }
+            if(isset($delims->quotationEnd)) {
+                $data['delimiters']['quotationEnd'] = $this->unescape($delims->quotationEnd->getValue());
+            }
+            if(isset($delims->alternateQuotationStart)) {
+                $data['delimiters']['alternateQuotationStart'] = $this->unescape($delims->alternateQuotationStart->getValue());
+            }
+            if(isset($delims->alternateQuotationEnd)) {
+                $data['delimiters']['alternateQuotationEnd'] = $this->unescape($delims->alternateQuotationEnd->getValue());
+            }
+        }
+
+        if(isset($ldmlTree->dates)) {
+            $dates = $ldmlTree->dates;
+
+            if(isset($dates->calendars)) {
+                $cals = $dates->calendars;
+
+                foreach($cals as $calendar) {
+
+                    if($calendar->getName() == 'default') {
+                        $data['calendars']['default'] = $calendar->getAttribute('choice');
+                    } elseif($calendar->getName() == 'calendar') {
+                        $calendarName = $calendar->getAttribute('type');
+
+                        if(!isset($data['calendars'][$calendarName])) {
+                            $data['calendars'][$calendarName] = array();
+                        }
+
+                        if(isset($calendar->months)) {
+                            $this->getCalendarWidth($calendar->months, 'month', $data['calendars'][$calendarName]);
+                        }
+
+                        if(isset($calendar->days)) {
+                            $this->getCalendarWidth($calendar->days, 'day', $data['calendars'][$calendarName]);
+                        }
+
+                        if(isset($calendar->quarters)) {
+                            $this->getCalendarWidth($calendar->quarters, 'quarter', $data['calendars'][$calendarName]);
+                        }
+
+                        if(isset($calendar->am)) {
+                            $data['calendars'][$calendarName]['am'] = $this->unescape($calendar->am->getValue());
+                        }
+                        if(isset($calendar->pm)) {
+                            $data['calendars'][$calendarName]['pm'] = $this->unescape($calendar->pm->getValue());
+                        }
+
+                        if(isset($calendar->eras)) {
+                            if(isset($calendar->eras->eraNames)) {
+                                foreach($this->getChildsOrAlias($calendar->eras->eraNames) as $era) {
+                                    $data['calendars'][$calendarName]['eras']['wide'][$era->getAttribute('type')] = $this->unescape($era->getValue());
+                                }
+                            }
+                            if(isset($calendar->eras->eraAbbr)) {
+                                foreach($this->getChildsOrAlias($calendar->eras->eraAbbr) as $era) {
+                                    $data['calendars'][$calendarName]['eras']['abbreviated'][$era->getAttribute('type')] = $this->unescape($era->getValue());
+                                }
+                            }
+                            if(isset($calendar->eras->eraNarrow)) {
+                                foreach($this->getChildsOrAlias($calendar->eras->eraNarrow) as $era) {
+                                    $data['calendars'][$calendarName]['eras']['narrow'][$era->getAttribute('type')] = $this->unescape($era->getValue());
+                                }
+                            }
+                        }
+
+                        if(isset($calendar->dateFormats)) {
+                            $this->getDateOrTimeFormats($calendar->dateFormats, 'dateFormat', $data['calendars'][$calendarName]);
+                        }
+                        if(isset($calendar->timeFormats)) {
+                            $this->getDateOrTimeFormats($calendar->timeFormats, 'timeFormat', $data['calendars'][$calendarName]);
+                        }
+
+                        if(isset($calendar->dateTimeFormats)) {
+                            $dtf = $calendar->dateTimeFormats;
+                            $data['calendars'][$calendarName]['dateTimeFormats']['default'] = isset($dtf->default) ? $dtf->default->getAttribute('choice') : '__default';
+
+                            $dtfItems = $this->getChildsOrAlias($dtf);
+                            foreach($dtfItems as $item) {
+                                if($item->getName() == 'dateTimeFormatLength') {
+                                    if(isset($item->dateTimeFormat->pattern)) {
+                                        $data['calendars'][$calendarName]['dateTimeFormats']['formats'][$item->getAttribute('type', '__default')] = $this->unescape($item->dateTimeFormat->pattern->getValue(), true);
+                                    } else {
+                                        throw new AgaviException('unknown child content in dateTimeFormatLength tag');
+                                    }
+                                } elseif($item->getName() == 'availableFormats') {
+                                    foreach($item as $dateFormatItem) {
+                                        if($dateFormatItem->getName() != 'dateFormatItem') {
+                                            throw new AgaviException('unknown childtag "' . $dateFormatItem->getName() . '" in availableFormats tag');
+                                        }
+                                        $data['calendars'][$calendarName]['dateTimeFormats']['availableFormats'][$dateFormatItem->getAttribute('id')] = $this->unescape($dateFormatItem->getValue(), true);
+                                    }
+                                } elseif($item->getName() == 'appendItems') {
+                                    foreach($item as $appendItem) {
+                                        if($appendItem->getName() != 'appendItem') {
+                                            throw new AgaviException('unknown childtag "' . $appendItem->getName() . '" in appendItems tag');
+                                        }
+                                        $data['calendars'][$calendarName]['dateTimeFormats']['appendItems'][$appendItem->getAttribute('request')] = $this->unescape($appendItem->getValue(), true);
+                                    }
+                                } elseif($item->getName() != 'default') {
+                                    throw new AgaviException('unknown childtag "' . $item->getName() . '" in dateTimeFormats tag');
+                                }
+                            }
+                        }
+
+                        if(isset($calendar->fields)) {
+                            foreach($this->getChildsOrAlias($calendar->fields) as $field) {
+                                $type = $field->getAttribute('type');
+                                if(isset($field->displayName)) {
+                                    $data['calendars'][$calendarName]['fields'][$type]['displayName'] = $this->unescape($field->displayName->getValue());
+                                }
+                                if(isset($field->relative)) {
+                                    foreach($field as $relative) {
+                                        if($relative->getName() == 'relative') {
+                                            $data['calendars'][$calendarName]['fields'][$type]['relatives'][$relative->getAttribute('type')] = $this->unescape($relative->getValue());
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    } else {
+                        throw new AgaviException('unknown childtag "' . $calendar->getName() . '" in calendars tag');
+                    }
+                }
+            }
 			
-			if(isset($dates->timeZoneNames)) {
-				$tzn = $dates->timeZoneNames;
-				if(isset($tzn->hourFormat)) {
-					$data['timeZoneNames']['hourFormat'] = $this->unescape($tzn->hourFormat->getValue());
-				}
-				if(isset($tzn->hoursFormat)) {
-					$data['timeZoneNames']['hoursFormat'] = $this->unescape($tzn->hoursFormat->getValue());
-				}
-				if(isset($tzn->gmtFormat)) {
-					$data['timeZoneNames']['gmtFormat'] = $this->unescape($tzn->gmtFormat->getValue());
-				}
-				if(isset($tzn->regionFormat)) {
-					$data['timeZoneNames']['regionFormat'] = $this->unescape($tzn->regionFormat->getValue());
-				}
-				if(isset($tzn->fallbackFormat)) {
-					$data['timeZoneNames']['fallbackFormat'] = $this->unescape($tzn->fallbackFormat->getValue());
-				}
-				if(isset($tzn->abbreviationFallback)) {
-					$data['timeZoneNames']['abbreviationFallback'] = $tzn->abbreviationFallback->getAttribute('choice');
-				}
-				if(isset($tzn->singleCountries)) {
-					$data['timeZoneNames']['singleCountries'] = explode(' ', $tzn->singleCountries->getAttribute('list'));
-				}
-
-				foreach($tzn as $zone) {
-					$zoneName = $zone->getAttribute('type');
-					if($zone->getName() == 'zone') {
-						if(isset($zone->long->generic)) {
-							$data['timeZoneNames']['zones'][$zoneName]['long']['generic'] = $this->unescape($zone->long->generic->getValue());
-						}
-						if(isset($zone->long->standard)) {
-							$data['timeZoneNames']['zones'][$zoneName]['long']['standard'] = $this->unescape($zone->long->standard->getValue());
-						}
-						if(isset($zone->long->daylight)) {
-							$data['timeZoneNames']['zones'][$zoneName]['long']['daylight'] = $this->unescape($zone->long->daylight->getValue());
-						}
-						if(isset($zone->short->generic)) {
-							$data['timeZoneNames']['zones'][$zoneName]['short']['generic'] = $this->unescape($zone->short->generic->getValue());
-						}
-						if(isset($zone->short->standard)) {
-							$data['timeZoneNames']['zones'][$zoneName]['short']['standard'] = $this->unescape($zone->short->standard->getValue());
-						}
-						if(isset($zone->short->daylight)) {
-							$data['timeZoneNames']['zones'][$zoneName]['short']['daylight'] = $this->unescape($zone->short->daylight->getValue());
-						}
-						if(isset($zone->exemplarCity)) {
-							$data['timeZoneNames']['zones'][$zoneName]['exemplarCity'] = $this->unescape($zone->exemplarCity->getValue());
-						}
-
-					}
-				}
-			}
-		}
-
-		if(isset($ldmlTree->numbers)) {
-			$nums = $ldmlTree->numbers;
-			if(!isset($data['numbers'])) {
-				$data['numbers'] = array();
-			}
-
-			if(isset($nums->symbols)) {
-				$syms = $nums->symbols;
-				if(isset($syms->decimal)) {
-					$data['numbers']['symbols']['decimal'] = $this->unescape($syms->decimal->getValue());
-				}
-				if(isset($syms->group)) {
-					$data['numbers']['symbols']['group'] = $this->unescape($syms->group->getValue());
-				}
-				if(isset($syms->list)) {
-					$data['numbers']['symbols']['list'] = $this->unescape($syms->list->getValue());
-				}
-				if(isset($syms->percentSign)) {
-					$data['numbers']['symbols']['percentSign'] = $this->unescape($syms->percentSign->getValue());
-				}
-				if(isset($syms->nativeZeroDigit)) {
-					$data['numbers']['symbols']['nativeZeroDigit'] = $this->unescape($syms->nativeZeroDigit->getValue());
-				}
-				if(isset($syms->patternDigit)) {
-					$data['numbers']['symbols']['patternDigit'] = $this->unescape($syms->patternDigit->getValue());
-				}
-				if(isset($syms->plusSign)) {
-					$data['numbers']['symbols']['plusSign'] = $this->unescape($syms->plusSign->getValue());
-				}
-				if(isset($syms->minusSign)) {
-					$data['numbers']['symbols']['minusSign'] = $this->unescape($syms->minusSign->getValue());
-				}
-				if(isset($syms->exponential)) {
-					$data['numbers']['symbols']['exponential'] = $this->unescape($syms->exponential->getValue());
-				}
-				if(isset($syms->perMille)) {
-					$data['numbers']['symbols']['perMille'] = $this->unescape($syms->perMille->getValue());
-				}
-				if(isset($syms->infinity)) {
-					$data['numbers']['symbols']['infinity'] = $this->unescape($syms->infinity->getValue());
-				}
-				if(isset($syms->nan)) {
-					$data['numbers']['symbols']['nan'] = $this->unescape($syms->nan->getValue());
-				}
-			}
-			if(isset($nums->decimalFormats)) {
-				$this->getNumberFormats($nums->decimalFormats, 'decimalFormat', $data['numbers']);
-			}
-			if(isset($nums->scientificFormats)) {
-				$this->getNumberFormats($nums->scientificFormats, 'scientificFormat', $data['numbers']);
-			}
-			if(isset($nums->percentFormats)) {
-				$this->getNumberFormats($nums->percentFormats, 'percentFormat', $data['numbers']);
-			}
-			if(isset($nums->currencyFormats)) {
-				$cf = $nums->currencyFormats;
-
-				foreach($this->getChildsOrAlias($cf) as $itemLength) {
-					if($itemLength->getName() == 'default') {
-						$data['numbers']['currencyFormats']['default'] = $itemLength->getAttribute('choice');
-					} elseif($itemLength->getName() == 'currencyFormatLength') {
-						$itemLengthName = $itemLength->getAttribute('type', '__default');
-
-						foreach($this->getChildsOrAlias($itemLength) as $itemFormat) {
-							if($itemFormat->getName() == 'currencyFormat') {
-								if(isset($itemFormat->pattern)) {
-									$data['numbers']['currencyFormats'][$itemLengthName] = $this->unescape($itemFormat->pattern->getValue());
-								}
-							} else {
-								throw new AgaviException('unknown childtag "' . $itemFormat->getName() . '" in currencyFormatLength tag');
-							}
-
-						}
-					} elseif($itemLength->getName() == 'currencySpacing') {
-
-						if(isset($itemLength->beforeCurrency->currencyMatch)) {
-							$data['numbers']['currencySpacing']['beforeCurrency']['currencyMatch'] = $this->unescape($itemLength->beforeCurrency->currencyMatch->getValue());
-						}
-						if(isset($itemLength->beforeCurrency->surroundingMatch)) {
-							$data['numbers']['currencySpacing']['beforeCurrency']['surroundingMatch'] = $this->unescape($itemLength->beforeCurrency->surroundingMatch->getValue());
-						}
-						if(isset($itemLength->beforeCurrency->insertBetween)) {
-							$data['numbers']['currencySpacing']['beforeCurrency']['insertBetween'] = $this->unescape($itemLength->beforeCurrency->insertBetween->getValue());
-						}
-						if(isset($itemLength->afterCurrency->currencyMatch)) {
-							$data['numbers']['currencySpacing']['afterCurrency']['currencyMatch'] = $this->unescape($itemLength->afterCurrency->currencyMatch->getValue());
-						}
-						if(isset($itemLength->afterCurrency->surroundingMatch)) {
-							$data['numbers']['currencySpacing']['afterCurrency']['surroundingMatch'] = $this->unescape($itemLength->afterCurrency->surroundingMatch->getValue());
-						}
-						if(isset($itemLength->afterCurrency->insertBetween)) {
-							$data['numbers']['currencySpacing']['afterCurrency']['insertBetween'] = $this->unescape($itemLength->afterCurrency->insertBetween->getValue());
-						}
-
-					} else {
-						throw new AgaviException('unknown childtag "' . $itemLength->getName() . '" in currencyFormats tag');
-					}
-				}
-			}
-			if(isset($nums->currencies)) {
-				foreach($nums->currencies as $currency) {
-					$name = $currency->getAttribute('type');
-					if(isset($currency->displayName)) {
-						$data['numbers']['currencies'][$name]['displayName'] = $this->unescape($currency->displayName->getValue());
-					}
-					if(isset($currency->symbol)) {
-						$symbolValue = $this->unescape($currency->symbol->getValue());
-						if($currency->symbol->getAttribute('choice') == 'true') {
-							$symbolValue = explode('|', $symbolValue);
-						}
-						$data['numbers']['currencies'][$name]['symbol'] = $symbolValue;
-					}
-				}
-			}
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Gets the value of each node with a type attribute.
-	 *
-	 * @param      array $list List of ConfigValueHolder items.
-	 * @param      array $data The array to store the parsed data to.
-	 *
-	 * @return     array The array with the data.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	protected function getTypeList($list, &$data)
-	{
-		// debug stuff to check if we missed any tags (lc = loop count)
-		$lc = 0;
-		foreach($list as $listItem) {
-			$type = $listItem->getAttribute('type');
-
-			if(!$listItem->hasAttribute('alt')) {
-				$data[$type] = $this->unescape($listItem->getValue());
-			}
-
-			++$lc;
-		}
-
-		if($lc != count($list->getChildren())) {
-			throw new AgaviException('wrong tagcount');
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Gets the calendar widths for the given item.
-	 *
-	 * @param      ConfigValueHolder $item The item.
-	 * @param      string $name The name of item.
-	 * @param      array $data The array to store the parsed data to.
-	 *
-	 * @return     array The array with the data.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	protected function getCalendarWidth(ConfigValueHolder $item, $name, &$data)
-	{
-		$dataIdxName = $name . 's';
-
-		$items = $this->getChildsOrAlias($item);
-		foreach($items as $itemContext) {
-			if($itemContext->getName() == 'default') {
-				$data[$dataIdxName]['default'] = $itemContext->getAttribute('choice');
-			} elseif($itemContext->getName() == $name . 'Context') {
-				$itemContextName = $itemContext->getAttribute('type');
-
-				foreach($itemContext as $itemWidths) {
-					if($itemWidths->getName() == 'default') {
-						$data[$dataIdxName][$itemContextName]['default'] = $itemWidths->getAttribute('choice');
-					} elseif($itemWidths->getName() == $name . 'Width') {
-						$itemWidthName = $itemWidths->getAttribute('type');
-
-						$widthChildItems = $this->getChildsOrAlias($itemWidths);
-						foreach($widthChildItems as $item) {
-							if($item->getName() != $name) {
-								throw new AgaviException('unknown childtag "' . $item->getName() . '" in ' . $name . 'Widths tag');
-							}
-
-							if(!$item->hasAttribute('alt')) {
-								$itemName = $item->getAttribute('type');
-								$data[$dataIdxName][$itemContextName][$itemWidthName][$itemName] = $this->unescape($item->getValue());
-							}
-						}
-					} else {
-						throw new AgaviException('unknown childtag "' . $itemWidths->getName() . '" in ' . $name . 'Context tag');
-					}
-
-				}
-			} else {
-				throw new AgaviException('unknown childtag "' . $itemContext->getName() . '" in ' . $name . 's tag');
-			}
-		}
-	}
-
-	/**
-	 * Gets the date or time formats the given item.
-	 *
-	 * @param      ConfigValueHolder $item The item.
-	 * @param      string $name The name of item.
-	 * @param      array $data The array to store the parsed data to.
-	 *
-	 * @return     array The array with the data.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	protected function getDateOrTimeFormats(ConfigValueHolder $item, $name, &$data)
-	{
-		$dataIdxName = $name . 's';
-
-		$items = $this->getChildsOrAlias($item);
-		foreach($items as $itemLength) {
-			if($itemLength->getName() == 'default') {
-				$data[$dataIdxName]['default'] = $itemLength->getAttribute('choice');
-			} elseif($itemLength->getName() == $name . 'Length') {
-				$itemLengthName = $itemLength->getAttribute('type', '__default');
-
-				$aliasedItemLength = $this->getChildsOrAlias($itemLength);
-				foreach($aliasedItemLength as $itemFormat) {
-					if($itemFormat->getName() == $name) {
-						if(isset($itemFormat->pattern)) {
-							$data[$dataIdxName][$itemLengthName]['pattern'] = $this->unescape($itemFormat->pattern->getValue(), true);
-						}
-						if(isset($itemFormat->displayName)) {
-							$data[$dataIdxName][$itemLengthName]['displayName'] = $this->unescape($itemFormat->displayName->getValue());
-						}
-					} else {
-						throw new AgaviException('unknown childtag "' . $itemFormat->getName() . '" in ' . $name . 'Length tag');
-					}
-
-				}
-			} else {
-				throw new AgaviException('unknown childtag "' . $itemLength->getName() . '" in ' . $name . 's tag');
-			}
-		}
-	}
-
-	/**
-	 * Gets the number formats the given item.
-	 *
-	 * @param      ConfigValueHolder The item.
-	 * @param      string The name of item.
-	 * @param      array The array to store the parsed data to.
-	 *
-	 * @return     array The array with the data.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	protected function getNumberFormats($item, $name, &$data)
-	{
-		$dataIdxName = $name . 's';
-
-		$items = $this->getChildsOrAlias($item);
-		foreach($items as $itemLength) {
-			if($itemLength->getName() == 'default') {
-				$data[$dataIdxName]['default'] = $itemLength->getAttribute('choice');
-			} elseif($itemLength->getName() == $name . 'Length') {
-				$itemLengthName = $itemLength->getAttribute('type', '__default');
-
-				foreach($this->getChildsOrAlias($itemLength) as $itemFormat) {
-					if($itemFormat->getName() == $name) {
-						if(isset($itemFormat->pattern)) {
-							$data[$dataIdxName][$itemLengthName] = $this->unescape($itemFormat->pattern->getValue());
-						}
-					} else {
-						throw new AgaviException('unknown childtag "' . $itemFormat->getName() . '" in ' . $name . 'Length tag');
-					}
-
-				}
-			} else {
-				throw new AgaviException('unknown childtag "' . $itemLength->getName() . '" in ' . $name . 's tag');
-			}
-		}
-	}
-
-	/**
-	 * Resolves the alias LDML tag.
-	 *
-	 * @param      ConfigValueHolder $item The item.
-	 *
-	 * @return     mixed Either the item if there is no alias or the resolved 
-	 *                   alias.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	protected function getChildsOrAlias(ConfigValueHolder $item)
-	{
-		if(isset($item->alias)) {
-			$alias = $item->alias;
-			if($alias->getAttribute('source') != 'locale') {
-				throw new AgaviException('The alias handling doesn\'t support any source except locale (' . $alias->getAttribute('source') . ' was given)');
-			}
-
-			$pathParts = explode('/', $alias->getAttribute('path'));
-
-			$currentNodeId = $item->getAttribute('__agavi_node_id');
+            if(isset($dates->timeZoneNames)) {
+                $tzn = $dates->timeZoneNames;
+                if(isset($tzn->hourFormat)) {
+                    $data['timeZoneNames']['hourFormat'] = $this->unescape($tzn->hourFormat->getValue());
+                }
+                if(isset($tzn->hoursFormat)) {
+                    $data['timeZoneNames']['hoursFormat'] = $this->unescape($tzn->hoursFormat->getValue());
+                }
+                if(isset($tzn->gmtFormat)) {
+                    $data['timeZoneNames']['gmtFormat'] = $this->unescape($tzn->gmtFormat->getValue());
+                }
+                if(isset($tzn->regionFormat)) {
+                    $data['timeZoneNames']['regionFormat'] = $this->unescape($tzn->regionFormat->getValue());
+                }
+                if(isset($tzn->fallbackFormat)) {
+                    $data['timeZoneNames']['fallbackFormat'] = $this->unescape($tzn->fallbackFormat->getValue());
+                }
+                if(isset($tzn->abbreviationFallback)) {
+                    $data['timeZoneNames']['abbreviationFallback'] = $tzn->abbreviationFallback->getAttribute('choice');
+                }
+                if(isset($tzn->singleCountries)) {
+                    $data['timeZoneNames']['singleCountries'] = explode(' ', $tzn->singleCountries->getAttribute('list'));
+                }
+
+                foreach($tzn as $zone) {
+                    $zoneName = $zone->getAttribute('type');
+                    if($zone->getName() == 'zone') {
+                        if(isset($zone->long->generic)) {
+                            $data['timeZoneNames']['zones'][$zoneName]['long']['generic'] = $this->unescape($zone->long->generic->getValue());
+                        }
+                        if(isset($zone->long->standard)) {
+                            $data['timeZoneNames']['zones'][$zoneName]['long']['standard'] = $this->unescape($zone->long->standard->getValue());
+                        }
+                        if(isset($zone->long->daylight)) {
+                            $data['timeZoneNames']['zones'][$zoneName]['long']['daylight'] = $this->unescape($zone->long->daylight->getValue());
+                        }
+                        if(isset($zone->short->generic)) {
+                            $data['timeZoneNames']['zones'][$zoneName]['short']['generic'] = $this->unescape($zone->short->generic->getValue());
+                        }
+                        if(isset($zone->short->standard)) {
+                            $data['timeZoneNames']['zones'][$zoneName]['short']['standard'] = $this->unescape($zone->short->standard->getValue());
+                        }
+                        if(isset($zone->short->daylight)) {
+                            $data['timeZoneNames']['zones'][$zoneName]['short']['daylight'] = $this->unescape($zone->short->daylight->getValue());
+                        }
+                        if(isset($zone->exemplarCity)) {
+                            $data['timeZoneNames']['zones'][$zoneName]['exemplarCity'] = $this->unescape($zone->exemplarCity->getValue());
+                        }
+
+                    }
+                }
+            }
+        }
+
+        if(isset($ldmlTree->numbers)) {
+            $nums = $ldmlTree->numbers;
+            if(!isset($data['numbers'])) {
+                $data['numbers'] = array();
+            }
+
+            if(isset($nums->symbols)) {
+                $syms = $nums->symbols;
+                if(isset($syms->decimal)) {
+                    $data['numbers']['symbols']['decimal'] = $this->unescape($syms->decimal->getValue());
+                }
+                if(isset($syms->group)) {
+                    $data['numbers']['symbols']['group'] = $this->unescape($syms->group->getValue());
+                }
+                if(isset($syms->list)) {
+                    $data['numbers']['symbols']['list'] = $this->unescape($syms->list->getValue());
+                }
+                if(isset($syms->percentSign)) {
+                    $data['numbers']['symbols']['percentSign'] = $this->unescape($syms->percentSign->getValue());
+                }
+                if(isset($syms->nativeZeroDigit)) {
+                    $data['numbers']['symbols']['nativeZeroDigit'] = $this->unescape($syms->nativeZeroDigit->getValue());
+                }
+                if(isset($syms->patternDigit)) {
+                    $data['numbers']['symbols']['patternDigit'] = $this->unescape($syms->patternDigit->getValue());
+                }
+                if(isset($syms->plusSign)) {
+                    $data['numbers']['symbols']['plusSign'] = $this->unescape($syms->plusSign->getValue());
+                }
+                if(isset($syms->minusSign)) {
+                    $data['numbers']['symbols']['minusSign'] = $this->unescape($syms->minusSign->getValue());
+                }
+                if(isset($syms->exponential)) {
+                    $data['numbers']['symbols']['exponential'] = $this->unescape($syms->exponential->getValue());
+                }
+                if(isset($syms->perMille)) {
+                    $data['numbers']['symbols']['perMille'] = $this->unescape($syms->perMille->getValue());
+                }
+                if(isset($syms->infinity)) {
+                    $data['numbers']['symbols']['infinity'] = $this->unescape($syms->infinity->getValue());
+                }
+                if(isset($syms->nan)) {
+                    $data['numbers']['symbols']['nan'] = $this->unescape($syms->nan->getValue());
+                }
+            }
+            if(isset($nums->decimalFormats)) {
+                $this->getNumberFormats($nums->decimalFormats, 'decimalFormat', $data['numbers']);
+            }
+            if(isset($nums->scientificFormats)) {
+                $this->getNumberFormats($nums->scientificFormats, 'scientificFormat', $data['numbers']);
+            }
+            if(isset($nums->percentFormats)) {
+                $this->getNumberFormats($nums->percentFormats, 'percentFormat', $data['numbers']);
+            }
+            if(isset($nums->currencyFormats)) {
+                $cf = $nums->currencyFormats;
+
+                foreach($this->getChildsOrAlias($cf) as $itemLength) {
+                    if($itemLength->getName() == 'default') {
+                        $data['numbers']['currencyFormats']['default'] = $itemLength->getAttribute('choice');
+                    } elseif($itemLength->getName() == 'currencyFormatLength') {
+                        $itemLengthName = $itemLength->getAttribute('type', '__default');
+
+                        foreach($this->getChildsOrAlias($itemLength) as $itemFormat) {
+                            if($itemFormat->getName() == 'currencyFormat') {
+                                if(isset($itemFormat->pattern)) {
+                                    $data['numbers']['currencyFormats'][$itemLengthName] = $this->unescape($itemFormat->pattern->getValue());
+                                }
+                            } else {
+                                throw new AgaviException('unknown childtag "' . $itemFormat->getName() . '" in currencyFormatLength tag');
+                            }
+
+                        }
+                    } elseif($itemLength->getName() == 'currencySpacing') {
+
+                        if(isset($itemLength->beforeCurrency->currencyMatch)) {
+                            $data['numbers']['currencySpacing']['beforeCurrency']['currencyMatch'] = $this->unescape($itemLength->beforeCurrency->currencyMatch->getValue());
+                        }
+                        if(isset($itemLength->beforeCurrency->surroundingMatch)) {
+                            $data['numbers']['currencySpacing']['beforeCurrency']['surroundingMatch'] = $this->unescape($itemLength->beforeCurrency->surroundingMatch->getValue());
+                        }
+                        if(isset($itemLength->beforeCurrency->insertBetween)) {
+                            $data['numbers']['currencySpacing']['beforeCurrency']['insertBetween'] = $this->unescape($itemLength->beforeCurrency->insertBetween->getValue());
+                        }
+                        if(isset($itemLength->afterCurrency->currencyMatch)) {
+                            $data['numbers']['currencySpacing']['afterCurrency']['currencyMatch'] = $this->unescape($itemLength->afterCurrency->currencyMatch->getValue());
+                        }
+                        if(isset($itemLength->afterCurrency->surroundingMatch)) {
+                            $data['numbers']['currencySpacing']['afterCurrency']['surroundingMatch'] = $this->unescape($itemLength->afterCurrency->surroundingMatch->getValue());
+                        }
+                        if(isset($itemLength->afterCurrency->insertBetween)) {
+                            $data['numbers']['currencySpacing']['afterCurrency']['insertBetween'] = $this->unescape($itemLength->afterCurrency->insertBetween->getValue());
+                        }
+
+                    } else {
+                        throw new AgaviException('unknown childtag "' . $itemLength->getName() . '" in currencyFormats tag');
+                    }
+                }
+            }
+            if(isset($nums->currencies)) {
+                foreach($nums->currencies as $currency) {
+                    $name = $currency->getAttribute('type');
+                    if(isset($currency->displayName)) {
+                        $data['numbers']['currencies'][$name]['displayName'] = $this->unescape($currency->displayName->getValue());
+                    }
+                    if(isset($currency->symbol)) {
+                        $symbolValue = $this->unescape($currency->symbol->getValue());
+                        if($currency->symbol->getAttribute('choice') == 'true') {
+                            $symbolValue = explode('|', $symbolValue);
+                        }
+                        $data['numbers']['currencies'][$name]['symbol'] = $symbolValue;
+                    }
+                }
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Gets the value of each node with a type attribute.
+     *
+     * @param      array $list List of ConfigValueHolder items.
+     * @param      array $data The array to store the parsed data to.
+     *
+     * @return     array The array with the data.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    protected function getTypeList($list, &$data)
+    {
+        // debug stuff to check if we missed any tags (lc = loop count)
+        $lc = 0;
+        foreach($list as $listItem) {
+            $type = $listItem->getAttribute('type');
+
+            if(!$listItem->hasAttribute('alt')) {
+                $data[$type] = $this->unescape($listItem->getValue());
+            }
+
+            ++$lc;
+        }
+
+        if($lc != count($list->getChildren())) {
+            throw new AgaviException('wrong tagcount');
+        }
+
+        return $data;
+    }
+
+    /**
+     * Gets the calendar widths for the given item.
+     *
+     * @param      ConfigValueHolder $item The item.
+     * @param      string $name The name of item.
+     * @param      array $data The array to store the parsed data to.
+     *
+     * @return     array The array with the data.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    protected function getCalendarWidth(ConfigValueHolder $item, $name, &$data)
+    {
+        $dataIdxName = $name . 's';
+
+        $items = $this->getChildsOrAlias($item);
+        foreach($items as $itemContext) {
+            if($itemContext->getName() == 'default') {
+                $data[$dataIdxName]['default'] = $itemContext->getAttribute('choice');
+            } elseif($itemContext->getName() == $name . 'Context') {
+                $itemContextName = $itemContext->getAttribute('type');
+
+                foreach($itemContext as $itemWidths) {
+                    if($itemWidths->getName() == 'default') {
+                        $data[$dataIdxName][$itemContextName]['default'] = $itemWidths->getAttribute('choice');
+                    } elseif($itemWidths->getName() == $name . 'Width') {
+                        $itemWidthName = $itemWidths->getAttribute('type');
+
+                        $widthChildItems = $this->getChildsOrAlias($itemWidths);
+                        foreach($widthChildItems as $item) {
+                            if($item->getName() != $name) {
+                                throw new AgaviException('unknown childtag "' . $item->getName() . '" in ' . $name . 'Widths tag');
+                            }
+
+                            if(!$item->hasAttribute('alt')) {
+                                $itemName = $item->getAttribute('type');
+                                $data[$dataIdxName][$itemContextName][$itemWidthName][$itemName] = $this->unescape($item->getValue());
+                            }
+                        }
+                    } else {
+                        throw new AgaviException('unknown childtag "' . $itemWidths->getName() . '" in ' . $name . 'Context tag');
+                    }
+
+                }
+            } else {
+                throw new AgaviException('unknown childtag "' . $itemContext->getName() . '" in ' . $name . 's tag');
+            }
+        }
+    }
+
+    /**
+     * Gets the date or time formats the given item.
+     *
+     * @param      ConfigValueHolder $item The item.
+     * @param      string $name The name of item.
+     * @param      array $data The array to store the parsed data to.
+     *
+     * @return     array The array with the data.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    protected function getDateOrTimeFormats(ConfigValueHolder $item, $name, &$data)
+    {
+        $dataIdxName = $name . 's';
+
+        $items = $this->getChildsOrAlias($item);
+        foreach($items as $itemLength) {
+            if($itemLength->getName() == 'default') {
+                $data[$dataIdxName]['default'] = $itemLength->getAttribute('choice');
+            } elseif($itemLength->getName() == $name . 'Length') {
+                $itemLengthName = $itemLength->getAttribute('type', '__default');
+
+                $aliasedItemLength = $this->getChildsOrAlias($itemLength);
+                foreach($aliasedItemLength as $itemFormat) {
+                    if($itemFormat->getName() == $name) {
+                        if(isset($itemFormat->pattern)) {
+                            $data[$dataIdxName][$itemLengthName]['pattern'] = $this->unescape($itemFormat->pattern->getValue(), true);
+                        }
+                        if(isset($itemFormat->displayName)) {
+                            $data[$dataIdxName][$itemLengthName]['displayName'] = $this->unescape($itemFormat->displayName->getValue());
+                        }
+                    } else {
+                        throw new AgaviException('unknown childtag "' . $itemFormat->getName() . '" in ' . $name . 'Length tag');
+                    }
+
+                }
+            } else {
+                throw new AgaviException('unknown childtag "' . $itemLength->getName() . '" in ' . $name . 's tag');
+            }
+        }
+    }
+
+    /**
+     * Gets the number formats the given item.
+     *
+     * @param      ConfigValueHolder The item.
+     * @param      string The name of item.
+     * @param      array The array to store the parsed data to.
+     *
+     * @return     array The array with the data.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    protected function getNumberFormats($item, $name, &$data)
+    {
+        $dataIdxName = $name . 's';
+
+        $items = $this->getChildsOrAlias($item);
+        foreach($items as $itemLength) {
+            if($itemLength->getName() == 'default') {
+                $data[$dataIdxName]['default'] = $itemLength->getAttribute('choice');
+            } elseif($itemLength->getName() == $name . 'Length') {
+                $itemLengthName = $itemLength->getAttribute('type', '__default');
+
+                foreach($this->getChildsOrAlias($itemLength) as $itemFormat) {
+                    if($itemFormat->getName() == $name) {
+                        if(isset($itemFormat->pattern)) {
+                            $data[$dataIdxName][$itemLengthName] = $this->unescape($itemFormat->pattern->getValue());
+                        }
+                    } else {
+                        throw new AgaviException('unknown childtag "' . $itemFormat->getName() . '" in ' . $name . 'Length tag');
+                    }
+
+                }
+            } else {
+                throw new AgaviException('unknown childtag "' . $itemLength->getName() . '" in ' . $name . 's tag');
+            }
+        }
+    }
+
+    /**
+     * Resolves the alias LDML tag.
+     *
+     * @param      ConfigValueHolder $item The item.
+     *
+     * @return     mixed Either the item if there is no alias or the resolved 
+     *                   alias.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    protected function getChildsOrAlias(ConfigValueHolder $item)
+    {
+        if(isset($item->alias)) {
+            $alias = $item->alias;
+            if($alias->getAttribute('source') != 'locale') {
+                throw new AgaviException('The alias handling doesn\'t support any source except locale (' . $alias->getAttribute('source') . ' was given)');
+            }
+
+            $pathParts = explode('/', $alias->getAttribute('path'));
+
+            $currentNodeId = $item->getAttribute('__agavi_node_id');
 			
-			foreach($pathParts as $part) {
-				// select the parent node
-				if($part == '..') {
-					$currentNodeId = $this->nodeRefs[$currentNodeId]->getAttribute('__agavi_parent_id');
-				} else {
-					$predicates = array();
-					if(preg_match('#([^\[]+)\[([^\]]+)\]#', $part, $match)) {
-						if(!preg_match('#@([^=]+)=\'([^\']+)\'#', $match[2], $predMatch)) {
-							throw new AgaviException('Unknown predicate ' . $match[2] . ' in alias xpath spec');
-						}
-						$tagName = $match[1];
-						$predicates[$predMatch[1]] = $predMatch[2];
-					} else {
-						$tagName = $part;
-					}
-					foreach($this->nodeRefs[$currentNodeId]->getChildren() as $childNode) {
-						$isSearchedNode = false;
-						if($childNode->getName() == $tagName) {
-							$predMatches = 0;
-							foreach($predicates as $attrib => $value) {
-								if($childNode->getAttribute($attrib) == $value) {
-									++$predMatches;
-								}
-							}
-							if($predMatches == count($predicates)) {
-								$isSearchedNode = true;
-							}
-						}
-
-						if($isSearchedNode) {
-							$currentNodeId = $childNode->getAttribute('__agavi_node_id');
-						}
-					}
-				}
-			}
-
-			return $this->nodeRefs[$currentNodeId]->getChildren();
-		} else {
-			return $item;
-		}
-	}
+            foreach($pathParts as $part) {
+                // select the parent node
+                if($part == '..') {
+                    $currentNodeId = $this->nodeRefs[$currentNodeId]->getAttribute('__agavi_parent_id');
+                } else {
+                    $predicates = array();
+                    if(preg_match('#([^\[]+)\[([^\]]+)\]#', $part, $match)) {
+                        if(!preg_match('#@([^=]+)=\'([^\']+)\'#', $match[2], $predMatch)) {
+                            throw new AgaviException('Unknown predicate ' . $match[2] . ' in alias xpath spec');
+                        }
+                        $tagName = $match[1];
+                        $predicates[$predMatch[1]] = $predMatch[2];
+                    } else {
+                        $tagName = $part;
+                    }
+                    foreach($this->nodeRefs[$currentNodeId]->getChildren() as $childNode) {
+                        $isSearchedNode = false;
+                        if($childNode->getName() == $tagName) {
+                            $predMatches = 0;
+                            foreach($predicates as $attrib => $value) {
+                                if($childNode->getAttribute($attrib) == $value) {
+                                    ++$predMatches;
+                                }
+                            }
+                            if($predMatches == count($predicates)) {
+                                $isSearchedNode = true;
+                            }
+                        }
+
+                        if($isSearchedNode) {
+                            $currentNodeId = $childNode->getAttribute('__agavi_node_id');
+                        }
+                    }
+                }
+            }
+
+            return $this->nodeRefs[$currentNodeId]->getChildren();
+        } else {
+            return $item;
+        }
+    }
 	
-	/**
-	 * Unescapes unicode escapes
-	 * 
-	 * @link       http://unicode.org/reports/tr35/#Unicode_Sets
-	 * 
-	 * @param      string $input The string to unescape.
-	 * @param      bool   $handleQuotes Whether the string needs to handle quoting behaviour
-	 *
-	 * @return     string The unescaped string.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0	
-	 */
-	protected function unescape($input, $handleQuotes = false)
-	{
-		$output = '';
-		$hex = '[0-9A-Fa-f]';
-		$rx = '\\\\(\\\\|u' . $hex . '{4}|U' . $hex . '{8}|x' . $hex .'{1,2}|[0-7]{1,3}|.)';
-		if($handleQuotes) {
-			// needs to be < -1 to not confuse the algorithm in the first run
-			$lastClose = -2;
-			if(preg_match_all("#'(?:''|[^'])+'|" . $rx . "#", $input, $matches, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE)) {
-				$output = $input;
-				$offsetMod = 0;
-				$ml = $matches[0];
-				$len = count($ml);
-				for($i = 0; $i < $len; ++ $i) {
-					$match = $ml[$i];
-					if($match[0][0] != '\'') {
-						// we check if there is a quoted string directly before or directly after the escape sequence
-						// by using the string lengths and the offset of the matches. Since an escape sequence directly before
-						// this sequence results in an quoted string we only check if its really a quoted string and not an
-						// escape sequence for parts coming after this sequence
-						$quoteBefore = ($i > 0 && (strlen($ml[$i - 1][0]) + $ml[$i - 1][1]) == $match[1]);
-						$quoteAfter = ($i + 1 < $len && $ml[$i + 1][0][0] == '\'' && (strlen($match[0]) + $match[1]) == $ml[$i + 1][1]);
-						$oldLen = strlen($output);
-						$unescaped = $this->unescapeCallback(array($match[0], substr($match[0], 1)));
-						$unescaped = ($quoteBefore ? '' : '\'') . $unescaped . ($quoteAfter ? '' : '\'');
-						$replacedPartLen = strlen($match[0]) + ((int) $quoteBefore) + ((int) $quoteAfter);
-						// replace the matched escape sequence with the unescaped one. we also replace the opening or closing quote
-						// from the quoted part before or after this escape sequence to include the unescaped string into the closed part
-						$output = substr_replace($output, $unescaped, $offsetMod + $match[1] + ($quoteBefore ? -1 : 0), $replacedPartLen);
-						// since the string length gets changed, we have to track the size change so we can adjust the offset from the match
-						$offsetMod += strlen($output) - $oldLen;
-					}
-				}
-			} else {
-				$output = $input;
-			}
-		} else {
-			$output = preg_replace_callback('#' . $rx . '#', array($this, 'unescapeCallback'), $input);
-		}
-
-		return $output;
-	}
+    /**
+     * Unescapes unicode escapes
+     * 
+     * @link       http://unicode.org/reports/tr35/#Unicode_Sets
+     * 
+     * @param      string $input The string to unescape.
+     * @param      bool   $handleQuotes Whether the string needs to handle quoting behaviour
+     *
+     * @return     string The unescaped string.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0	
+     */
+    protected function unescape($input, $handleQuotes = false)
+    {
+        $output = '';
+        $hex = '[0-9A-Fa-f]';
+        $rx = '\\\\(\\\\|u' . $hex . '{4}|U' . $hex . '{8}|x' . $hex .'{1,2}|[0-7]{1,3}|.)';
+        if($handleQuotes) {
+            // needs to be < -1 to not confuse the algorithm in the first run
+            $lastClose = -2;
+            if(preg_match_all("#'(?:''|[^'])+'|" . $rx . "#", $input, $matches, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE)) {
+                $output = $input;
+                $offsetMod = 0;
+                $ml = $matches[0];
+                $len = count($ml);
+                for($i = 0; $i < $len; ++ $i) {
+                    $match = $ml[$i];
+                    if($match[0][0] != '\'') {
+                        // we check if there is a quoted string directly before or directly after the escape sequence
+                        // by using the string lengths and the offset of the matches. Since an escape sequence directly before
+                        // this sequence results in an quoted string we only check if its really a quoted string and not an
+                        // escape sequence for parts coming after this sequence
+                        $quoteBefore = ($i > 0 && (strlen($ml[$i - 1][0]) + $ml[$i - 1][1]) == $match[1]);
+                        $quoteAfter = ($i + 1 < $len && $ml[$i + 1][0][0] == '\'' && (strlen($match[0]) + $match[1]) == $ml[$i + 1][1]);
+                        $oldLen = strlen($output);
+                        $unescaped = $this->unescapeCallback(array($match[0], substr($match[0], 1)));
+                        $unescaped = ($quoteBefore ? '' : '\'') . $unescaped . ($quoteAfter ? '' : '\'');
+                        $replacedPartLen = strlen($match[0]) + ((int) $quoteBefore) + ((int) $quoteAfter);
+                        // replace the matched escape sequence with the unescaped one. we also replace the opening or closing quote
+                        // from the quoted part before or after this escape sequence to include the unescaped string into the closed part
+                        $output = substr_replace($output, $unescaped, $offsetMod + $match[1] + ($quoteBefore ? -1 : 0), $replacedPartLen);
+                        // since the string length gets changed, we have to track the size change so we can adjust the offset from the match
+                        $offsetMod += strlen($output) - $oldLen;
+                    }
+                }
+            } else {
+                $output = $input;
+            }
+        } else {
+            $output = preg_replace_callback('#' . $rx . '#', array($this, 'unescapeCallback'), $input);
+        }
+
+        return $output;
+    }
 	
-	/**
-	 * Unescapes a single unicode escape sequence. This is designed to be a 
-	 * preg_replace_callback callback function.
-	 * 
-	 * @param      array $matches The match.
-	 *
-	 * @return     string The unescaped sequence.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0	
-	 */
-	protected function unescapeCallback($matches)
-	{
-		static $map = array(
-			'a' => "\x07",
-			'b' => "\x08",
-			't' => "\x09",
-			'n' => "\x0A",
-			'v' => "\x0B",
-			'f' => "\x0C",
-			'r' => "\x0D",
-			'\\' => '\\',
-		);
+    /**
+     * Unescapes a single unicode escape sequence. This is designed to be a 
+     * preg_replace_callback callback function.
+     * 
+     * @param      array $matches The match.
+     *
+     * @return     string The unescaped sequence.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0	
+     */
+    protected function unescapeCallback($matches)
+    {
+        static $map = array(
+            'a' => "\x07",
+            'b' => "\x08",
+            't' => "\x09",
+            'n' => "\x0A",
+            'v' => "\x0B",
+            'f' => "\x0C",
+            'r' => "\x0D",
+            '\\' => '\\',
+        );
 		
 		
-		$res = '';
+        $res = '';
 		
-		$char = $matches[1][0];
-		$seq = substr($matches[1], 1);
-		if($char == 'u' || $char == 'U' || $char == 'x') {
-			$res = html_entity_decode('&#x' . $seq . ';', ENT_QUOTES, 'utf-8');
-		} elseif(is_numeric($char)) {
-			$res = html_entity_decode('&#' . octdec($matches[1]) . ';', ENT_QUOTES, 'utf-8');
-		} elseif(isset($map[$char])) {
-			$res = $map[$char];
-		} else {
-			$res = $char; // something like \s or \0 or so, just return the character ("s" or "0")
-		}
+        $char = $matches[1][0];
+        $seq = substr($matches[1], 1);
+        if($char == 'u' || $char == 'U' || $char == 'x') {
+            $res = html_entity_decode('&#x' . $seq . ';', ENT_QUOTES, 'utf-8');
+        } elseif(is_numeric($char)) {
+            $res = html_entity_decode('&#' . octdec($matches[1]) . ';', ENT_QUOTES, 'utf-8');
+        } elseif(isset($map[$char])) {
+            $res = $map[$char];
+        } else {
+            $res = $char; // something like \s or \0 or so, just return the character ("s" or "0")
+        }
 		
-		return $res;
-	}
+        return $res;
+    }
 }
 
 ?>
\ No newline at end of file

src/config/RbacDefinitionConfigHandler.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 	/**
 	 * Parse a 'roles' node.
 	 *
-	 * @param      mixed  $roles  The "roles" node (element or node list)
+	 * @param      \DOMNodeList  $roles  The "roles" node (element or node list)
 	 * @param      string $parent The name of the parent role, or null.
 	 * @param      array  $data   A reference to the output data array.
 	 *

Spacing +6 added lines, -6 removed lines

@@ -61,8 +61,8 @@ 
 		
 		$data = array();
 
-		foreach($document->getConfigurationElements() as $cfg) {
-			if(!$cfg->has('roles')) {
+		foreach ($document->getConfigurationElements() as $cfg) {
+			if (!$cfg->has('roles')) {
 				continue;
 			}
 			
@@ -87,18 +87,18 @@ 
 	protected function parseRoles($roles, $parent, &$data)
 	{
 		/** @var XmlConfigDomElement $role */
-		foreach($roles as $role) {
+		foreach ($roles as $role) {
 			$name = $role->getAttribute('name');
 			$entry = array();
 			$entry['parent'] = $parent;
 			$entry['permissions'] = array();
-			if($role->has('permissions')) {
+			if ($role->has('permissions')) {
 				/** @var XmlConfigDomElement $permission */
-				foreach($role->get('permissions') as $permission) {
+				foreach ($role->get('permissions') as $permission) {
 					$entry['permissions'][] = $permission->getValue();
 				}
 			}
-			if($role->has('roles')) {
+			if ($role->has('roles')) {
 				$this->parseRoles($role->get('roles'), $name, $data);
 			}
 			$data[$name] = $entry;

Indentation +61 added lines, -61 removed lines

@@ -36,74 +36,74 @@
  */
 class RbacDefinitionConfigHandler extends XmlConfigHandler
 {
-	const XML_NAMESPACE = 'http://agavi.org/agavi/config/parts/rbac_definitions/1.1';
+    const XML_NAMESPACE = 'http://agavi.org/agavi/config/parts/rbac_definitions/1.1';
 	
-	/**
-	 * Execute this configuration handler.
-	 *
-	 * @param      XmlConfigDomDocument $document The document to parse.
-	 *
-	 * @return     string Data to be written to a cache file.
-	 *
-	 * @throws     <b>UnreadableException</b> If a requested configuration
-	 *                                        file does not exist or is not
-	 *                                        readable.
-	 * @throws     <b>ParseException</b> If a requested configuration file is
-	 *                                   improperly formatted.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function execute(XmlConfigDomDocument $document)
-	{
-		// set up our default namespace
-		$document->setDefaultNamespace(self::XML_NAMESPACE, 'rbac_definitions');
+    /**
+     * Execute this configuration handler.
+     *
+     * @param      XmlConfigDomDocument $document The document to parse.
+     *
+     * @return     string Data to be written to a cache file.
+     *
+     * @throws     <b>UnreadableException</b> If a requested configuration
+     *                                        file does not exist or is not
+     *                                        readable.
+     * @throws     <b>ParseException</b> If a requested configuration file is
+     *                                   improperly formatted.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function execute(XmlConfigDomDocument $document)
+    {
+        // set up our default namespace
+        $document->setDefaultNamespace(self::XML_NAMESPACE, 'rbac_definitions');
 		
-		$data = array();
+        $data = array();
 
-		foreach($document->getConfigurationElements() as $cfg) {
-			if(!$cfg->has('roles')) {
-				continue;
-			}
+        foreach($document->getConfigurationElements() as $cfg) {
+            if(!$cfg->has('roles')) {
+                continue;
+            }
 			
-			$this->parseRoles($cfg->get('roles'), null, $data);
-		}
+            $this->parseRoles($cfg->get('roles'), null, $data);
+        }
 
-		$code = "return " . var_export($data, true) . ";";
+        $code = "return " . var_export($data, true) . ";";
 		
-		return $this->generate($code, $document->documentURI);
-	}
+        return $this->generate($code, $document->documentURI);
+    }
 	
-	/**
-	 * Parse a 'roles' node.
-	 *
-	 * @param      mixed  $roles  The "roles" node (element or node list)
-	 * @param      string $parent The name of the parent role, or null.
-	 * @param      array  $data   A reference to the output data array.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	protected function parseRoles($roles, $parent, &$data)
-	{
-		/** @var XmlConfigDomElement $role */
-		foreach($roles as $role) {
-			$name = $role->getAttribute('name');
-			$entry = array();
-			$entry['parent'] = $parent;
-			$entry['permissions'] = array();
-			if($role->has('permissions')) {
-				/** @var XmlConfigDomElement $permission */
-				foreach($role->get('permissions') as $permission) {
-					$entry['permissions'][] = $permission->getValue();
-				}
-			}
-			if($role->has('roles')) {
-				$this->parseRoles($role->get('roles'), $name, $data);
-			}
-			$data[$name] = $entry;
-		}
-	}
+    /**
+     * Parse a 'roles' node.
+     *
+     * @param      mixed  $roles  The "roles" node (element or node list)
+     * @param      string $parent The name of the parent role, or null.
+     * @param      array  $data   A reference to the output data array.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    protected function parseRoles($roles, $parent, &$data)
+    {
+        /** @var XmlConfigDomElement $role */
+        foreach($roles as $role) {
+            $name = $role->getAttribute('name');
+            $entry = array();
+            $entry['parent'] = $parent;
+            $entry['permissions'] = array();
+            if($role->has('permissions')) {
+                /** @var XmlConfigDomElement $permission */
+                foreach($role->get('permissions') as $permission) {
+                    $entry['permissions'][] = $permission->getValue();
+                }
+            }
+            if($role->has('roles')) {
+                $this->parseRoles($role->get('roles'), $name, $data);
+            }
+            $data[$name] = $entry;
+        }
+    }
 }
 
 ?>
\ No newline at end of file

src/config/RoutingConfigHandler.class.php

Unused Use Statements -1 removed lines

@@ -16,7 +16,6 @@
 namespace Agavi\Config;
 
 use Agavi\Config\Util\Dom\XmlConfigDomElement;
-use Agavi\Config\Util\Dom\XmlConfigDomNode;
 use Agavi\Core\Context;
 use Agavi\Config\XmlConfigHandler;
 use Agavi\Config\Util\Dom\XmlConfigDomDocument;

Indentation +136 added lines, -136 removed lines

@@ -42,149 +42,149 @@
  */
 class RoutingConfigHandler extends XmlConfigHandler
 {
-	const XML_NAMESPACE = 'http://agavi.org/agavi/config/parts/routing/1.1';
+    const XML_NAMESPACE = 'http://agavi.org/agavi/config/parts/routing/1.1';
 	
-	/**
-	 * @var        array Stores the generated names of unnamed routes.
-	 */
-	protected $unnamedRoutes = array();
+    /**
+     * @var        array Stores the generated names of unnamed routes.
+     */
+    protected $unnamedRoutes = array();
 	
-	/**
-	 * Execute this configuration handler.
-	 *
-	 * @param      XmlConfigDomDocument $document The document to parse.
-	 *
-	 * @return     string Data to be written to a cache file.
-	 *
-	 * @throws     <b>UnreadableException</b> If a requested configuration
-	 *                                             file does not exist or is not
-	 *                                             readable.
-	 * @throws     <b>ParseException</b> If a requested configuration file is
-	 *                                        improperly formatted.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      0.11.0
-	 */
-	public function execute(XmlConfigDomDocument $document)
-	{
-		// set up our default namespace
-		$document->setDefaultNamespace(self::XML_NAMESPACE, 'routing');
+    /**
+     * Execute this configuration handler.
+     *
+     * @param      XmlConfigDomDocument $document The document to parse.
+     *
+     * @return     string Data to be written to a cache file.
+     *
+     * @throws     <b>UnreadableException</b> If a requested configuration
+     *                                             file does not exist or is not
+     *                                             readable.
+     * @throws     <b>ParseException</b> If a requested configuration file is
+     *                                        improperly formatted.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      0.11.0
+     */
+    public function execute(XmlConfigDomDocument $document)
+    {
+        // set up our default namespace
+        $document->setDefaultNamespace(self::XML_NAMESPACE, 'routing');
 		
-		$routing = Context::getInstance($this->context)->getRouting();
+        $routing = Context::getInstance($this->context)->getRouting();
 
-		// reset the stored route names
-		$this->unnamedRoutes = array();
+        // reset the stored route names
+        $this->unnamedRoutes = array();
 
-		// clear the routing
-		$routing->importRoutes(array());
+        // clear the routing
+        $routing->importRoutes(array());
 		
-		foreach($document->getConfigurationElements() as $cfg) {
-			if($cfg->has('routes')) {
-				$this->parseRoutes($routing, $cfg->get('routes'));
-			}
-		}
-
-		// we cannot do this:
-		// $code = '$this->importRoutes(unserialize(' . var_export(serialize($routing->exportRoutes()), true) . '));';
-		// return $this->generate($code, $document->documentURI);
-		// because var_export() incorrectly escapes null-byte sequences as \000, which results in a corrupted string, and unserialize() doesn't like corrupted strings
-		// this was fixed in PHP 5.2.6, but we're compatible with 5.2.0+
-		// see http://bugs.php.net/bug.php?id=37262 and http://bugs.php.net/bug.php?id=42272
+        foreach($document->getConfigurationElements() as $cfg) {
+            if($cfg->has('routes')) {
+                $this->parseRoutes($routing, $cfg->get('routes'));
+            }
+        }
+
+        // we cannot do this:
+        // $code = '$this->importRoutes(unserialize(' . var_export(serialize($routing->exportRoutes()), true) . '));';
+        // return $this->generate($code, $document->documentURI);
+        // because var_export() incorrectly escapes null-byte sequences as \000, which results in a corrupted string, and unserialize() doesn't like corrupted strings
+        // this was fixed in PHP 5.2.6, but we're compatible with 5.2.0+
+        // see http://bugs.php.net/bug.php?id=37262 and http://bugs.php.net/bug.php?id=42272
 		
-		return serialize($routing->exportRoutes());
-	}
-
-	/**
-	 * Takes a nested array of AgaviConfigValueHolder containing the routing
-	 * information and creates the routes in the given routing.
-	 *
-	 * @param      Routing               $routing The routing instance to create the routes in.
-	 * @param      XmlConfigDomElement[] $routes  The "routes" node (element or node list)
-	 * @param      string                $parent  The name of the parent route (if any).
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	protected function parseRoutes(Routing $routing, $routes, $parent = null)
-	{
-		foreach($routes as $route) {
-			$pattern = Toolkit::expandDirectives($route->getAttribute('pattern'));
-			$opts = array();
-			if($route->hasAttribute('imply'))					$opts['imply']				= Toolkit::literalize($route->getAttribute('imply'));
-			if($route->hasAttribute('cut'))						$opts['cut']					= Toolkit::literalize($route->getAttribute('cut'));
-			if($route->hasAttribute('stop'))					$opts['stop']					= Toolkit::literalize($route->getAttribute('stop'));
-			if($route->hasAttribute('name'))					$opts['name']					= Toolkit::expandDirectives($route->getAttribute('name'));
-			if($route->hasAttribute('source'))				$opts['source']				= Toolkit::expandDirectives($route->getAttribute('source'));
-			if($route->hasAttribute('constraint'))		$opts['constraint']		= array_map('trim', explode(' ', trim(Toolkit::expandDirectives($route->getAttribute('constraint')))));
-			// values which will be set when the route matched
-			if($route->hasAttribute('controller'))				$opts['controller']				= Toolkit::expandDirectives($route->getAttribute('controller'));
-			if($route->hasAttribute('locale'))				$opts['locale']				= Toolkit::expandDirectives($route->getAttribute('locale'));
-			if($route->hasAttribute('method'))				$opts['method']				= Toolkit::expandDirectives($route->getAttribute('method'));
-			if($route->hasAttribute('module'))				$opts['module']				= Toolkit::expandDirectives($route->getAttribute('module'));
-			if($route->hasAttribute('output_type'))		$opts['output_type']	= Toolkit::expandDirectives($route->getAttribute('output_type'));
-
-			if($route->has('ignores')) {
-				/** @var XmlConfigDomElement $ignore */
-				foreach($route->get('ignores') as $ignore) {
-					$opts['ignores'][] = $ignore->getValue();
-				}
-			}
-
-			if($route->has('defaults')) {
-				/** @var XmlConfigDomElement $default */
-				foreach($route->get('defaults') as $default) {
-					$opts['defaults'][$default->getAttribute('for')] = $default->getValue();
-				}
-			}
-
-			if($route->has('callbacks')) {
-				$opts['callbacks'] = array();
-				/** @var XmlConfigDomElement $callback */
-				foreach($route->get('callbacks') as $callback) {
-					$opts['callbacks'][] = array(
-						'class' => $callback->getAttribute('class'),
-						'parameters' => $callback->getAgaviParameters(),
-					);
-				}
-			}
-
-			$opts['parameters'] = $route->getAgaviParameters();
-
-			if(isset($opts['name']) && $parent) {
-				// don't overwrite $parent since it's used later
-				$parentName = $parent;
-				if($opts['name'][0] == '.') {
-					while($parentName && isset($this->unnamedRoutes[$parentName])) {
-						$parentRoute = $routing->getRoute($parentName);
-						$parentName = $parentRoute['opt']['parent'];
-					}
-					$opts['name'] = $parentName . $opts['name'];
-				}
-			}
-
-			if(isset($opts['controller']) && $parent) {
-				if($opts['controller'][0] == '.') {
-					$parentRoute = $routing->getRoute($parent);
-					// unwind all empty 'controller' attributes of the parent(s)
-					while($parentRoute && empty($parentRoute['opt']['controller'])) {
-						$parentRoute = $routing->getRoute($parentRoute['opt']['parent']);
-					}
-					if(!empty($parentRoute['opt']['controller'])) {
-						$opts['controller'] = $parentRoute['opt']['controller'] . $opts['controller'];
-					}
-				}
-			}
-
-			$name = $routing->addRoute($pattern, $opts, $parent);
-			if(!isset($opts['name']) || $opts['name'] !== $name) {
-				$this->unnamedRoutes[$name] = true;
-			}
-			if($route->has('routes')) {
-				$this->parseRoutes($routing, $route->get('routes'), $name);
-			}
-		}
-	}
+        return serialize($routing->exportRoutes());
+    }
+
+    /**
+     * Takes a nested array of AgaviConfigValueHolder containing the routing
+     * information and creates the routes in the given routing.
+     *
+     * @param      Routing               $routing The routing instance to create the routes in.
+     * @param      XmlConfigDomElement[] $routes  The "routes" node (element or node list)
+     * @param      string                $parent  The name of the parent route (if any).
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    protected function parseRoutes(Routing $routing, $routes, $parent = null)
+    {
+        foreach($routes as $route) {
+            $pattern = Toolkit::expandDirectives($route->getAttribute('pattern'));
+            $opts = array();
+            if($route->hasAttribute('imply'))					$opts['imply']				= Toolkit::literalize($route->getAttribute('imply'));
+            if($route->hasAttribute('cut'))						$opts['cut']					= Toolkit::literalize($route->getAttribute('cut'));
+            if($route->hasAttribute('stop'))					$opts['stop']					= Toolkit::literalize($route->getAttribute('stop'));
+            if($route->hasAttribute('name'))					$opts['name']					= Toolkit::expandDirectives($route->getAttribute('name'));
+            if($route->hasAttribute('source'))				$opts['source']				= Toolkit::expandDirectives($route->getAttribute('source'));
+            if($route->hasAttribute('constraint'))		$opts['constraint']		= array_map('trim', explode(' ', trim(Toolkit::expandDirectives($route->getAttribute('constraint')))));
+            // values which will be set when the route matched
+            if($route->hasAttribute('controller'))				$opts['controller']				= Toolkit::expandDirectives($route->getAttribute('controller'));
+            if($route->hasAttribute('locale'))				$opts['locale']				= Toolkit::expandDirectives($route->getAttribute('locale'));
+            if($route->hasAttribute('method'))				$opts['method']				= Toolkit::expandDirectives($route->getAttribute('method'));
+            if($route->hasAttribute('module'))				$opts['module']				= Toolkit::expandDirectives($route->getAttribute('module'));
+            if($route->hasAttribute('output_type'))		$opts['output_type']	= Toolkit::expandDirectives($route->getAttribute('output_type'));
+
+            if($route->has('ignores')) {
+                /** @var XmlConfigDomElement $ignore */
+                foreach($route->get('ignores') as $ignore) {
+                    $opts['ignores'][] = $ignore->getValue();
+                }
+            }
+
+            if($route->has('defaults')) {
+                /** @var XmlConfigDomElement $default */
+                foreach($route->get('defaults') as $default) {
+                    $opts['defaults'][$default->getAttribute('for')] = $default->getValue();
+                }
+            }
+
+            if($route->has('callbacks')) {
+                $opts['callbacks'] = array();
+                /** @var XmlConfigDomElement $callback */
+                foreach($route->get('callbacks') as $callback) {
+                    $opts['callbacks'][] = array(
+                        'class' => $callback->getAttribute('class'),
+                        'parameters' => $callback->getAgaviParameters(),
+                    );
+                }
+            }
+
+            $opts['parameters'] = $route->getAgaviParameters();
+
+            if(isset($opts['name']) && $parent) {
+                // don't overwrite $parent since it's used later
+                $parentName = $parent;
+                if($opts['name'][0] == '.') {
+                    while($parentName && isset($this->unnamedRoutes[$parentName])) {
+                        $parentRoute = $routing->getRoute($parentName);
+                        $parentName = $parentRoute['opt']['parent'];
+                    }
+                    $opts['name'] = $parentName . $opts['name'];
+                }
+            }
+
+            if(isset($opts['controller']) && $parent) {
+                if($opts['controller'][0] == '.') {
+                    $parentRoute = $routing->getRoute($parent);
+                    // unwind all empty 'controller' attributes of the parent(s)
+                    while($parentRoute && empty($parentRoute['opt']['controller'])) {
+                        $parentRoute = $routing->getRoute($parentRoute['opt']['parent']);
+                    }
+                    if(!empty($parentRoute['opt']['controller'])) {
+                        $opts['controller'] = $parentRoute['opt']['controller'] . $opts['controller'];
+                    }
+                }
+            }
+
+            $name = $routing->addRoute($pattern, $opts, $parent);
+            if(!isset($opts['name']) || $opts['name'] !== $name) {
+                $this->unnamedRoutes[$name] = true;
+            }
+            if($route->has('routes')) {
+                $this->parseRoutes($routing, $route->get('routes'), $name);
+            }
+        }
+    }
 }
 
 ?>
\ No newline at end of file

Spacing +29 added lines, -29 removed lines

@@ -79,8 +79,8 @@ 
 		// clear the routing
 		$routing->importRoutes(array());
 		
-		foreach($document->getConfigurationElements() as $cfg) {
-			if($cfg->has('routes')) {
+		foreach ($document->getConfigurationElements() as $cfg) {
+			if ($cfg->has('routes')) {
 				$this->parseRoutes($routing, $cfg->get('routes'));
 			}
 		}
@@ -108,40 +108,40 @@ 
 	 */
 	protected function parseRoutes(Routing $routing, $routes, $parent = null)
 	{
-		foreach($routes as $route) {
+		foreach ($routes as $route) {
 			$pattern = Toolkit::expandDirectives($route->getAttribute('pattern'));
 			$opts = array();
-			if($route->hasAttribute('imply'))					$opts['imply']				= Toolkit::literalize($route->getAttribute('imply'));
-			if($route->hasAttribute('cut'))						$opts['cut']					= Toolkit::literalize($route->getAttribute('cut'));
-			if($route->hasAttribute('stop'))					$opts['stop']					= Toolkit::literalize($route->getAttribute('stop'));
-			if($route->hasAttribute('name'))					$opts['name']					= Toolkit::expandDirectives($route->getAttribute('name'));
-			if($route->hasAttribute('source'))				$opts['source']				= Toolkit::expandDirectives($route->getAttribute('source'));
-			if($route->hasAttribute('constraint'))		$opts['constraint']		= array_map('trim', explode(' ', trim(Toolkit::expandDirectives($route->getAttribute('constraint')))));
+			if ($route->hasAttribute('imply'))					$opts['imply'] = Toolkit::literalize($route->getAttribute('imply'));
+			if ($route->hasAttribute('cut'))						$opts['cut'] = Toolkit::literalize($route->getAttribute('cut'));
+			if ($route->hasAttribute('stop'))					$opts['stop']					= Toolkit::literalize($route->getAttribute('stop'));
+			if ($route->hasAttribute('name'))					$opts['name']					= Toolkit::expandDirectives($route->getAttribute('name'));
+			if ($route->hasAttribute('source'))				$opts['source'] = Toolkit::expandDirectives($route->getAttribute('source'));
+			if ($route->hasAttribute('constraint'))		$opts['constraint'] = array_map('trim', explode(' ', trim(Toolkit::expandDirectives($route->getAttribute('constraint')))));
 			// values which will be set when the route matched
-			if($route->hasAttribute('controller'))				$opts['controller']				= Toolkit::expandDirectives($route->getAttribute('controller'));
-			if($route->hasAttribute('locale'))				$opts['locale']				= Toolkit::expandDirectives($route->getAttribute('locale'));
-			if($route->hasAttribute('method'))				$opts['method']				= Toolkit::expandDirectives($route->getAttribute('method'));
-			if($route->hasAttribute('module'))				$opts['module']				= Toolkit::expandDirectives($route->getAttribute('module'));
-			if($route->hasAttribute('output_type'))		$opts['output_type']	= Toolkit::expandDirectives($route->getAttribute('output_type'));
+			if ($route->hasAttribute('controller'))				$opts['controller'] = Toolkit::expandDirectives($route->getAttribute('controller'));
+			if ($route->hasAttribute('locale'))				$opts['locale']				= Toolkit::expandDirectives($route->getAttribute('locale'));
+			if ($route->hasAttribute('method'))				$opts['method']				= Toolkit::expandDirectives($route->getAttribute('method'));
+			if ($route->hasAttribute('module'))				$opts['module']				= Toolkit::expandDirectives($route->getAttribute('module'));
+			if ($route->hasAttribute('output_type'))		$opts['output_type'] = Toolkit::expandDirectives($route->getAttribute('output_type'));
 
-			if($route->has('ignores')) {
+			if ($route->has('ignores')) {
 				/** @var XmlConfigDomElement $ignore */
-				foreach($route->get('ignores') as $ignore) {
+				foreach ($route->get('ignores') as $ignore) {
 					$opts['ignores'][] = $ignore->getValue();
 				}
 			}
 
-			if($route->has('defaults')) {
+			if ($route->has('defaults')) {
 				/** @var XmlConfigDomElement $default */
-				foreach($route->get('defaults') as $default) {
+				foreach ($route->get('defaults') as $default) {
 					$opts['defaults'][$default->getAttribute('for')] = $default->getValue();
 				}
 			}
 
-			if($route->has('callbacks')) {
+			if ($route->has('callbacks')) {
 				$opts['callbacks'] = array();
 				/** @var XmlConfigDomElement $callback */
-				foreach($route->get('callbacks') as $callback) {
+				foreach ($route->get('callbacks') as $callback) {
 					$opts['callbacks'][] = array(
 						'class' => $callback->getAttribute('class'),
 						'parameters' => $callback->getAgaviParameters(),
@@ -151,11 +151,11 @@ 
 
 			$opts['parameters'] = $route->getAgaviParameters();
 
-			if(isset($opts['name']) && $parent) {
+			if (isset($opts['name']) && $parent) {
 				// don't overwrite $parent since it's used later
 				$parentName = $parent;
-				if($opts['name'][0] == '.') {
-					while($parentName && isset($this->unnamedRoutes[$parentName])) {
+				if ($opts['name'][0] == '.') {
+					while ($parentName && isset($this->unnamedRoutes[$parentName])) {
 						$parentRoute = $routing->getRoute($parentName);
 						$parentName = $parentRoute['opt']['parent'];
 					}
@@ -163,24 +163,24 @@ 
 				}
 			}
 
-			if(isset($opts['controller']) && $parent) {
-				if($opts['controller'][0] == '.') {
+			if (isset($opts['controller']) && $parent) {
+				if ($opts['controller'][0] == '.') {
 					$parentRoute = $routing->getRoute($parent);
 					// unwind all empty 'controller' attributes of the parent(s)
-					while($parentRoute && empty($parentRoute['opt']['controller'])) {
+					while ($parentRoute && empty($parentRoute['opt']['controller'])) {
 						$parentRoute = $routing->getRoute($parentRoute['opt']['parent']);
 					}
-					if(!empty($parentRoute['opt']['controller'])) {
+					if (!empty($parentRoute['opt']['controller'])) {
 						$opts['controller'] = $parentRoute['opt']['controller'] . $opts['controller'];
 					}
 				}
 			}
 
 			$name = $routing->addRoute($pattern, $opts, $parent);
-			if(!isset($opts['name']) || $opts['name'] !== $name) {
+			if (!isset($opts['name']) || $opts['name'] !== $name) {
 				$this->unnamedRoutes[$name] = true;
 			}
-			if($route->has('routes')) {
+			if ($route->has('routes')) {
 				$this->parseRoutes($routing, $route->get('routes'), $name);
 			}
 		}

Braces +33 added lines, -11 removed lines

@@ -111,18 +111,40 @@
 		foreach($routes as $route) {
 			$pattern = Toolkit::expandDirectives($route->getAttribute('pattern'));
 			$opts = array();
-			if($route->hasAttribute('imply'))					$opts['imply']				= Toolkit::literalize($route->getAttribute('imply'));
-			if($route->hasAttribute('cut'))						$opts['cut']					= Toolkit::literalize($route->getAttribute('cut'));
-			if($route->hasAttribute('stop'))					$opts['stop']					= Toolkit::literalize($route->getAttribute('stop'));
-			if($route->hasAttribute('name'))					$opts['name']					= Toolkit::expandDirectives($route->getAttribute('name'));
-			if($route->hasAttribute('source'))				$opts['source']				= Toolkit::expandDirectives($route->getAttribute('source'));
-			if($route->hasAttribute('constraint'))		$opts['constraint']		= array_map('trim', explode(' ', trim(Toolkit::expandDirectives($route->getAttribute('constraint')))));
+			if($route->hasAttribute('imply')) {
+			    $opts['imply']				= Toolkit::literalize($route->getAttribute('imply'));
+			}
+			if($route->hasAttribute('cut')) {
+			    $opts['cut']					= Toolkit::literalize($route->getAttribute('cut'));
+			}
+			if($route->hasAttribute('stop')) {
+			    $opts['stop']					= Toolkit::literalize($route->getAttribute('stop'));
+			}
+			if($route->hasAttribute('name')) {
+			    $opts['name']					= Toolkit::expandDirectives($route->getAttribute('name'));
+			}
+			if($route->hasAttribute('source')) {
+			    $opts['source']				= Toolkit::expandDirectives($route->getAttribute('source'));
+			}
+			if($route->hasAttribute('constraint')) {
+			    $opts['constraint']		= array_map('trim', explode(' ', trim(Toolkit::expandDirectives($route->getAttribute('constraint')))));
+			}
 			// values which will be set when the route matched
-			if($route->hasAttribute('controller'))				$opts['controller']				= Toolkit::expandDirectives($route->getAttribute('controller'));
-			if($route->hasAttribute('locale'))				$opts['locale']				= Toolkit::expandDirectives($route->getAttribute('locale'));
-			if($route->hasAttribute('method'))				$opts['method']				= Toolkit::expandDirectives($route->getAttribute('method'));
-			if($route->hasAttribute('module'))				$opts['module']				= Toolkit::expandDirectives($route->getAttribute('module'));
-			if($route->hasAttribute('output_type'))		$opts['output_type']	= Toolkit::expandDirectives($route->getAttribute('output_type'));
+			if($route->hasAttribute('controller')) {
+			    $opts['controller']				= Toolkit::expandDirectives($route->getAttribute('controller'));
+			}
+			if($route->hasAttribute('locale')) {
+			    $opts['locale']				= Toolkit::expandDirectives($route->getAttribute('locale'));
+			}
+			if($route->hasAttribute('method')) {
+			    $opts['method']				= Toolkit::expandDirectives($route->getAttribute('method'));
+			}
+			if($route->hasAttribute('module')) {
+			    $opts['module']				= Toolkit::expandDirectives($route->getAttribute('module'));
+			}
+			if($route->hasAttribute('output_type')) {
+			    $opts['output_type']	= Toolkit::expandDirectives($route->getAttribute('output_type'));
+			}
 
 			if($route->has('ignores')) {
 				/** @var XmlConfigDomElement $ignore */

src/config/util/dom/XmlConfigDomDocument.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -235,7 +235,7 @@
 	 * @param      bool     $deep Whether or not to recursively import the node's
 	 *                            subtree.
 	 *
-	 * @return     \DOMNode|XmlConfigDomNode|bool  The copied node, or false if it cannot be copied.
+	 * @return     \DOMNode  The copied node, or false if it cannot be copied.
 	 *
 	 * @author     Noah Fontes <noah.fontes@bitextender.com>
 	 * @since      1.0.0

Spacing +26 added lines, -26 removed lines

@@ -87,7 +87,7 @@ 
 	{
 		parent::__construct($version, $encoding);
 		
-		foreach($this->nodeClassMap as $domClass => $agaviClass) {
+		foreach ($this->nodeClassMap as $domClass => $agaviClass) {
 			$this->registerNodeClass($domClass, $agaviClass);
 		}
 		
@@ -112,9 +112,9 @@ 
 		
 		$result = parent::load($filename, $options);
 		
-		if(libxml_get_last_error() !== false) {
+		if (libxml_get_last_error() !== false) {
 			$errors = array();
-			foreach(libxml_get_errors() as $error) {
+			foreach (libxml_get_errors() as $error) {
 				$errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
 			}
 			libxml_clear_errors();
@@ -132,7 +132,7 @@ 
 		
 		$this->xpath = new \DOMXPath($this);
 		
-		if($this->isAgaviConfiguration()) {
+		if ($this->isAgaviConfiguration()) {
 			XmlConfigParser::registerAgaviNamespaces($this);
 		}
 		
@@ -157,9 +157,9 @@ 
 		
 		$result = parent::loadXML($source, $options);
 		
-		if(libxml_get_last_error() !== false) {
+		if (libxml_get_last_error() !== false) {
 			$errors = array();
-			foreach(libxml_get_errors() as $error) {
+			foreach (libxml_get_errors() as $error) {
 				$errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
 			}
 			libxml_clear_errors();
@@ -177,7 +177,7 @@ 
 		
 		$this->xpath = new \DOMXPath($this);
 		
-		if($this->isAgaviConfiguration()) {
+		if ($this->isAgaviConfiguration()) {
 			XmlConfigParser::registerAgaviNamespaces($this);
 		}
 		
@@ -201,17 +201,17 @@ 
 		
 		$result = parent::xinclude($options);
 		
-		if(libxml_get_last_error() !== false) {
+		if (libxml_get_last_error() !== false) {
 			$throw = false;
 			$errors = array();
-			foreach(libxml_get_errors() as $error) {
-				if($error->level != LIBXML_ERR_WARNING) {
+			foreach (libxml_get_errors() as $error) {
+				if ($error->level != LIBXML_ERR_WARNING) {
 					$throw = true;
 				}
 				$errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
 			}
 			libxml_clear_errors();
-			if($throw) {
+			if ($throw) {
 				libxml_use_internal_errors($luie);
 				throw new \DOMException(
 					sprintf(
@@ -247,9 +247,9 @@ 
 		
 		$result = parent::importNode($node, $deep);
 		
-		if(libxml_get_last_error() !== false) {
+		if (libxml_get_last_error() !== false) {
 			$errors = array();
-			foreach(libxml_get_errors() as $error) {
+			foreach (libxml_get_errors() as $error) {
 				$errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
 			}
 			libxml_clear_errors();
@@ -285,9 +285,9 @@ 
 		libxml_clear_errors();
 		
 		// gotta do the @ to suppress PHP warnings when the schema cannot be loaded or is invalid
-		if(!$result = @parent::schemaValidate($filename)) {
+		if (!$result = @parent::schemaValidate($filename)) {
 			$errors = array();
-			foreach(libxml_get_errors() as $error) {
+			foreach (libxml_get_errors() as $error) {
 				$errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
 			}
 			libxml_clear_errors();
@@ -323,9 +323,9 @@ 
 		libxml_clear_errors();
 		
 		// gotta do the @ to suppress PHP warnings when the schema cannot be loaded or is invalid
-		if(!$result = @parent::schemaValidateSource($source)) {
+		if (!$result = @parent::schemaValidateSource($source)) {
 			$errors = array();
-			foreach(libxml_get_errors() as $error) {
+			foreach (libxml_get_errors() as $error) {
 				$errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
 			}
 			libxml_clear_errors();
@@ -360,9 +360,9 @@ 
 		libxml_clear_errors();
 		
 		// gotta do the @ to suppress PHP warnings when the schema cannot be loaded or is invalid
-		if(!$result = @parent::relaxNGValidate($filename)) {
+		if (!$result = @parent::relaxNGValidate($filename)) {
 			$errors = array();
-			foreach(libxml_get_errors() as $error) {
+			foreach (libxml_get_errors() as $error) {
 				$errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
 			}
 			libxml_clear_errors();
@@ -466,7 +466,7 @@ 
 	 */
 	public function getAgaviEnvelopeNamespace()
 	{
-		if($this->isAgaviConfiguration()) {
+		if ($this->isAgaviConfiguration()) {
 			return $this->documentElement->namespaceURI;
 		}
 	}
@@ -484,11 +484,11 @@ 
 	{
 		$retval = array();
 		
-		if($this->isAgaviConfiguration()) {
+		if ($this->isAgaviConfiguration()) {
 			$agaviNs = $this->getAgaviEnvelopeNamespace();
 			
-			foreach($this->documentElement->childNodes as $node) {
-				if($node->nodeType == XML_ELEMENT_NODE && $node->localName == 'configuration' && $node->namespaceURI == $agaviNs) {
+			foreach ($this->documentElement->childNodes as $node) {
+				if ($node->nodeType == XML_ELEMENT_NODE && $node->localName == 'configuration' && $node->namespaceURI == $agaviNs) {
 					$retval[] = $node;
 				}
 			}
@@ -507,11 +507,11 @@ 
 	 */
 	public function getSandbox()
 	{
-		if($this->isAgaviConfiguration()) {
+		if ($this->isAgaviConfiguration()) {
 			$agaviNs = $this->getAgaviEnvelopeNamespace();
 			
-			foreach($this->documentElement->childNodes as $node) {
-				if($node->nodeType == XML_ELEMENT_NODE && $node->localName == 'sandbox' && $node->namespaceURI == $agaviNs) {
+			foreach ($this->documentElement->childNodes as $node) {
+				if ($node->nodeType == XML_ELEMENT_NODE && $node->localName == 'sandbox' && $node->namespaceURI == $agaviNs) {
 					return $node;
 				}
 			}

Indentation +461 added lines, -461 removed lines

@@ -35,488 +35,488 @@
  */
 class XmlConfigDomDocument extends \DOMDocument
 {
-	/**
-	 * @var        string Default namespace used by several convenience methods in
-	 *                    other node classes to access/retrieve elements.
-	 */
-	protected $defaultNamespaceUri = '';
+    /**
+     * @var        string Default namespace used by several convenience methods in
+     *                    other node classes to access/retrieve elements.
+     */
+    protected $defaultNamespaceUri = '';
 	
-	/**
-	 * @var        string XPath prefix of the default namespace defined above.
-	 */
-	protected $defaultNamespacePrefix = '';
+    /**
+     * @var        string XPath prefix of the default namespace defined above.
+     */
+    protected $defaultNamespacePrefix = '';
 	
-	/**
-	 * @var        \DOMXPath A DOMXPath instance for this document.
-	 */
-	protected $xpath = null;
+    /**
+     * @var        \DOMXPath A DOMXPath instance for this document.
+     */
+    protected $xpath = null;
 	
-	/**
-	 * @var        array A map of DOM classes and extended Agavi implementations.
-	 */
-	protected $nodeClassMap = array(
-		'\\DOMAttr'                  => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomAttr',
-		'\\DOMCharacterData'         => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomCharacterData',
-		'\\DOMComment'               => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomComment',
-		// yes, even DOMDocument, so we don't get back a vanilla DOMDocument when doing $doc->documentElement etc
-		'\\DOMDocument'              => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomDocument',
-		'\\DOMDocumentFragment'      => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomDocumentFragment',
-		'\\DOMDocumentType'          => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomDocumentType',
-		'\\DOMElement'               => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomElement',
-		'\\DOMEntity'                => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomEntity',
-		'\\DOMEntityReference'       => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomEntityReference',
-		'\\DOMNode'                  => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomNode',
-		// 'DOMNotation'              => 'XmlConfigDomNotation',
-		'\\DOMProcessingInstruction' => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomProcessingInstruction',
-		'\\DOMText'                  => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomText',
-	);
+    /**
+     * @var        array A map of DOM classes and extended Agavi implementations.
+     */
+    protected $nodeClassMap = array(
+        '\\DOMAttr'                  => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomAttr',
+        '\\DOMCharacterData'         => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomCharacterData',
+        '\\DOMComment'               => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomComment',
+        // yes, even DOMDocument, so we don't get back a vanilla DOMDocument when doing $doc->documentElement etc
+        '\\DOMDocument'              => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomDocument',
+        '\\DOMDocumentFragment'      => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomDocumentFragment',
+        '\\DOMDocumentType'          => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomDocumentType',
+        '\\DOMElement'               => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomElement',
+        '\\DOMEntity'                => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomEntity',
+        '\\DOMEntityReference'       => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomEntityReference',
+        '\\DOMNode'                  => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomNode',
+        // 'DOMNotation'              => 'XmlConfigDomNotation',
+        '\\DOMProcessingInstruction' => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomProcessingInstruction',
+        '\\DOMText'                  => 'Agavi\\Config\\Util\\Dom\\XmlConfigDomText',
+    );
 	
-	/**
-	 * The constructor.
-	 * Will auto-register Agavi DOM node classes and create an XPath instance.
-	 *
-	 * @param      string $version  The XML version.
-	 * @param      string $encoding The XML encoding.
-	 *
-	 * @see        DOMDocument::__construct()
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      1.0.0
-	 */
-	public function __construct($version = "1.0", $encoding = "UTF-8")
-	{
-		parent::__construct($version, $encoding);
-		
-		foreach($this->nodeClassMap as $domClass => $agaviClass) {
-			$this->registerNodeClass($domClass, $agaviClass);
-		}
-		
-		$this->xpath = new \DOMXPath($this);
-	}
+    /**
+     * The constructor.
+     * Will auto-register Agavi DOM node classes and create an XPath instance.
+     *
+     * @param      string $version  The XML version.
+     * @param      string $encoding The XML encoding.
+     *
+     * @see        DOMDocument::__construct()
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      1.0.0
+     */
+    public function __construct($version = "1.0", $encoding = "UTF-8")
+    {
+        parent::__construct($version, $encoding);
+		
+        foreach($this->nodeClassMap as $domClass => $agaviClass) {
+            $this->registerNodeClass($domClass, $agaviClass);
+        }
+		
+        $this->xpath = new \DOMXPath($this);
+    }
 	
-	/**
-	 * Load XML from a file.
-	 *
-	 * @param      string $filename The path to the XML document.
-	 * @param      int    $options  Bitwise OR of the libxml option constants.
-	 *
-	 * @return     bool True of the operation is successful; false otherwise.
-	 *
-	 * @author     Noah Fontes <noah.fontes@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function load($filename, $options = 0)
-	{
-		$luie = libxml_use_internal_errors(true);
-		libxml_clear_errors();
-		
-		$result = parent::load($filename, $options);
-		
-		if(libxml_get_last_error() !== false) {
-			$errors = array();
-			foreach(libxml_get_errors() as $error) {
-				$errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
-			}
-			libxml_clear_errors();
-			libxml_use_internal_errors($luie);
-			throw new \DOMException(
-				sprintf(
-					'Error%s occurred while parsing the document: ' . "\n\n%s",
-					count($errors) > 1 ? 's' : '',
-					implode("\n", $errors)
-				)
-			);
-		}
-		
-		libxml_use_internal_errors($luie);
-		
-		$this->xpath = new \DOMXPath($this);
-		
-		if($this->isAgaviConfiguration()) {
-			XmlConfigParser::registerAgaviNamespaces($this);
-		}
-		
-		return $result;
-	}
+    /**
+     * Load XML from a file.
+     *
+     * @param      string $filename The path to the XML document.
+     * @param      int    $options  Bitwise OR of the libxml option constants.
+     *
+     * @return     bool True of the operation is successful; false otherwise.
+     *
+     * @author     Noah Fontes <noah.fontes@bitextender.com>
+     * @since      1.0.0
+     */
+    public function load($filename, $options = 0)
+    {
+        $luie = libxml_use_internal_errors(true);
+        libxml_clear_errors();
+		
+        $result = parent::load($filename, $options);
+		
+        if(libxml_get_last_error() !== false) {
+            $errors = array();
+            foreach(libxml_get_errors() as $error) {
+                $errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
+            }
+            libxml_clear_errors();
+            libxml_use_internal_errors($luie);
+            throw new \DOMException(
+                sprintf(
+                    'Error%s occurred while parsing the document: ' . "\n\n%s",
+                    count($errors) > 1 ? 's' : '',
+                    implode("\n", $errors)
+                )
+            );
+        }
+		
+        libxml_use_internal_errors($luie);
+		
+        $this->xpath = new \DOMXPath($this);
+		
+        if($this->isAgaviConfiguration()) {
+            XmlConfigParser::registerAgaviNamespaces($this);
+        }
+		
+        return $result;
+    }
 	
-	/**
-	 * Load XML from a string.
-	 *
-	 * @param      string $source  The string containing the XML.
-	 * @param      int    $options Bitwise OR of the libxml option constants.
-	 *
-	 * @return     bool True of the operation is successful; false otherwise.
-	 *
-	 * @author     Noah Fontes <noah.fontes@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function loadXml($source, $options = 0)
-	{
-		$luie = libxml_use_internal_errors(true);
-		libxml_clear_errors();
-		
-		$result = parent::loadXML($source, $options);
-		
-		if(libxml_get_last_error() !== false) {
-			$errors = array();
-			foreach(libxml_get_errors() as $error) {
-				$errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
-			}
-			libxml_clear_errors();
-			libxml_use_internal_errors($luie);
-			throw new \DOMException(
-				sprintf(
-					'Error%s occurred while parsing the document: ' . "\n\n%s",
-					count($errors) > 1 ? 's' : '',
-					implode("\n", $errors)
-				)
-			);
-		}
-		
-		libxml_use_internal_errors($luie);
-		
-		$this->xpath = new \DOMXPath($this);
-		
-		if($this->isAgaviConfiguration()) {
-			XmlConfigParser::registerAgaviNamespaces($this);
-		}
-		
-		return $result;
-	}
+    /**
+     * Load XML from a string.
+     *
+     * @param      string $source  The string containing the XML.
+     * @param      int    $options Bitwise OR of the libxml option constants.
+     *
+     * @return     bool True of the operation is successful; false otherwise.
+     *
+     * @author     Noah Fontes <noah.fontes@bitextender.com>
+     * @since      1.0.0
+     */
+    public function loadXml($source, $options = 0)
+    {
+        $luie = libxml_use_internal_errors(true);
+        libxml_clear_errors();
+		
+        $result = parent::loadXML($source, $options);
+		
+        if(libxml_get_last_error() !== false) {
+            $errors = array();
+            foreach(libxml_get_errors() as $error) {
+                $errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
+            }
+            libxml_clear_errors();
+            libxml_use_internal_errors($luie);
+            throw new \DOMException(
+                sprintf(
+                    'Error%s occurred while parsing the document: ' . "\n\n%s",
+                    count($errors) > 1 ? 's' : '',
+                    implode("\n", $errors)
+                )
+            );
+        }
+		
+        libxml_use_internal_errors($luie);
+		
+        $this->xpath = new \DOMXPath($this);
+		
+        if($this->isAgaviConfiguration()) {
+            XmlConfigParser::registerAgaviNamespaces($this);
+        }
+		
+        return $result;
+    }
 	
-	/**
-	 * Substitutes XIncludes in a DOMDocument object.
-	 *
-	 * @param      int $options Bitwise OR of the libxml option constants.
-	 *
-	 * @return     int The number of XIncludes in the document.
-	 *
-	 * @author     Noah Fontes <noah.fontes@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function xinclude($options = 0)
-	{
-		$luie = libxml_use_internal_errors(true);
-		libxml_clear_errors();
-		
-		$result = parent::xinclude($options);
-		
-		if(libxml_get_last_error() !== false) {
-			$throw = false;
-			$errors = array();
-			foreach(libxml_get_errors() as $error) {
-				if($error->level != LIBXML_ERR_WARNING) {
-					$throw = true;
-				}
-				$errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
-			}
-			libxml_clear_errors();
-			if($throw) {
-				libxml_use_internal_errors($luie);
-				throw new \DOMException(
-					sprintf(
-						'Error%s occurred while resolving XInclude directives: ' . "\n\n%s", 
-						count($errors) > 1 ? 's' : '', 
-						implode("\n", $errors)
-					)
-				);
-			}
-		}
-		
-		libxml_use_internal_errors($luie);
-		
-		return $result;
-	}
+    /**
+     * Substitutes XIncludes in a DOMDocument object.
+     *
+     * @param      int $options Bitwise OR of the libxml option constants.
+     *
+     * @return     int The number of XIncludes in the document.
+     *
+     * @author     Noah Fontes <noah.fontes@bitextender.com>
+     * @since      1.0.0
+     */
+    public function xinclude($options = 0)
+    {
+        $luie = libxml_use_internal_errors(true);
+        libxml_clear_errors();
+		
+        $result = parent::xinclude($options);
+		
+        if(libxml_get_last_error() !== false) {
+            $throw = false;
+            $errors = array();
+            foreach(libxml_get_errors() as $error) {
+                if($error->level != LIBXML_ERR_WARNING) {
+                    $throw = true;
+                }
+                $errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
+            }
+            libxml_clear_errors();
+            if($throw) {
+                libxml_use_internal_errors($luie);
+                throw new \DOMException(
+                    sprintf(
+                        'Error%s occurred while resolving XInclude directives: ' . "\n\n%s", 
+                        count($errors) > 1 ? 's' : '', 
+                        implode("\n", $errors)
+                    )
+                );
+            }
+        }
+		
+        libxml_use_internal_errors($luie);
+		
+        return $result;
+    }
 	
-	/**
-	 * Import a node into the current document.
-	 *
-	 * @param      \DOMNode $node The node to import.
-	 * @param      bool     $deep Whether or not to recursively import the node's
-	 *                            subtree.
-	 *
-	 * @return     \DOMNode|XmlConfigDomNode|bool  The copied node, or false if it cannot be copied.
-	 *
-	 * @author     Noah Fontes <noah.fontes@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function importNode(\DOMNode $node, $deep)
-	{
-		$luie = libxml_use_internal_errors(true);
-		libxml_clear_errors();
-		
-		$result = parent::importNode($node, $deep);
-		
-		if(libxml_get_last_error() !== false) {
-			$errors = array();
-			foreach(libxml_get_errors() as $error) {
-				$errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
-			}
-			libxml_clear_errors();
-			libxml_use_internal_errors($luie);
-			throw new \DOMException(
-				sprintf(
-					'Error%s occurred while importing a new node "%s": ' . "\n\n%s",
-					count($errors) > 1 ? 's' : '', 
-					$node->nodeName,
-					implode("\n", $errors)
-				)
-			);
-		}
-		
-		libxml_use_internal_errors($luie);
-		
-		return $result;
-	}
+    /**
+     * Import a node into the current document.
+     *
+     * @param      \DOMNode $node The node to import.
+     * @param      bool     $deep Whether or not to recursively import the node's
+     *                            subtree.
+     *
+     * @return     \DOMNode|XmlConfigDomNode|bool  The copied node, or false if it cannot be copied.
+     *
+     * @author     Noah Fontes <noah.fontes@bitextender.com>
+     * @since      1.0.0
+     */
+    public function importNode(\DOMNode $node, $deep)
+    {
+        $luie = libxml_use_internal_errors(true);
+        libxml_clear_errors();
+		
+        $result = parent::importNode($node, $deep);
+		
+        if(libxml_get_last_error() !== false) {
+            $errors = array();
+            foreach(libxml_get_errors() as $error) {
+                $errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
+            }
+            libxml_clear_errors();
+            libxml_use_internal_errors($luie);
+            throw new \DOMException(
+                sprintf(
+                    'Error%s occurred while importing a new node "%s": ' . "\n\n%s",
+                    count($errors) > 1 ? 's' : '', 
+                    $node->nodeName,
+                    implode("\n", $errors)
+                )
+            );
+        }
+		
+        libxml_use_internal_errors($luie);
+		
+        return $result;
+    }
 	
-	/**
-	 * Validate a document based on a schema.
-	 *
-	 * @param      string $filename The path to the schema.
-	 *
-	 * @return     bool True if the validation is successful; false otherwise.
-	 *
-	 * @author     Noah Fontes <noah.fontes@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function schemaValidate($filename)
-	{
-		$luie = libxml_use_internal_errors(true);
-		libxml_clear_errors();
-		
-		// gotta do the @ to suppress PHP warnings when the schema cannot be loaded or is invalid
-		if(!$result = @parent::schemaValidate($filename)) {
-			$errors = array();
-			foreach(libxml_get_errors() as $error) {
-				$errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
-			}
-			libxml_clear_errors();
-			libxml_use_internal_errors($luie);
-			throw new \DOMException(
-				sprintf(
-					'XML Schema validation with "%s" failed due to the following error%s: ' . "\n\n%s", 
-					$filename, 
-					count($errors) > 1 ? 's' : '', 
-					implode("\n", $errors)
-				)
-			);
-		}
-		
-		libxml_use_internal_errors($luie);
-		
-		return $result;
-	}
+    /**
+     * Validate a document based on a schema.
+     *
+     * @param      string $filename The path to the schema.
+     *
+     * @return     bool True if the validation is successful; false otherwise.
+     *
+     * @author     Noah Fontes <noah.fontes@bitextender.com>
+     * @since      1.0.0
+     */
+    public function schemaValidate($filename)
+    {
+        $luie = libxml_use_internal_errors(true);
+        libxml_clear_errors();
+		
+        // gotta do the @ to suppress PHP warnings when the schema cannot be loaded or is invalid
+        if(!$result = @parent::schemaValidate($filename)) {
+            $errors = array();
+            foreach(libxml_get_errors() as $error) {
+                $errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
+            }
+            libxml_clear_errors();
+            libxml_use_internal_errors($luie);
+            throw new \DOMException(
+                sprintf(
+                    'XML Schema validation with "%s" failed due to the following error%s: ' . "\n\n%s", 
+                    $filename, 
+                    count($errors) > 1 ? 's' : '', 
+                    implode("\n", $errors)
+                )
+            );
+        }
+		
+        libxml_use_internal_errors($luie);
+		
+        return $result;
+    }
 	
-	/**
-	 * Validate a document based on a schema.
-	 *
-	 * @param      string $source A string containing the schema.
-	 *
-	 * @return     bool True if the validation is successful; false otherwise.
-	 *
-	 * @author     Noah Fontes <noah.fontes@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function schemaValidateSource($source)
-	{
-		$luie = libxml_use_internal_errors(true);
-		libxml_clear_errors();
-		
-		// gotta do the @ to suppress PHP warnings when the schema cannot be loaded or is invalid
-		if(!$result = @parent::schemaValidateSource($source)) {
-			$errors = array();
-			foreach(libxml_get_errors() as $error) {
-				$errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
-			}
-			libxml_clear_errors();
-			libxml_use_internal_errors($luie);
-			throw new \DOMException(
-				sprintf(
-					'XML Schema validation failed due to the following error%s: ' . "\n\n%s", 
-					count($errors) > 1 ? 's' : '', 
-					implode("\n", $errors)
-				)
-			);
-		}
-		
-		libxml_use_internal_errors($luie);
-		
-		return $result;
-	}
+    /**
+     * Validate a document based on a schema.
+     *
+     * @param      string $source A string containing the schema.
+     *
+     * @return     bool True if the validation is successful; false otherwise.
+     *
+     * @author     Noah Fontes <noah.fontes@bitextender.com>
+     * @since      1.0.0
+     */
+    public function schemaValidateSource($source)
+    {
+        $luie = libxml_use_internal_errors(true);
+        libxml_clear_errors();
+		
+        // gotta do the @ to suppress PHP warnings when the schema cannot be loaded or is invalid
+        if(!$result = @parent::schemaValidateSource($source)) {
+            $errors = array();
+            foreach(libxml_get_errors() as $error) {
+                $errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
+            }
+            libxml_clear_errors();
+            libxml_use_internal_errors($luie);
+            throw new \DOMException(
+                sprintf(
+                    'XML Schema validation failed due to the following error%s: ' . "\n\n%s", 
+                    count($errors) > 1 ? 's' : '', 
+                    implode("\n", $errors)
+                )
+            );
+        }
+		
+        libxml_use_internal_errors($luie);
+		
+        return $result;
+    }
 	
-	/**
-	 * Perform RELAX NG validation on the document.
-	 *
-	 * @param      string $filename The path to the schema.
-	 *
-	 * @return     bool True if the validation is successful; false otherwise.
-	 *
-	 * @author     Noah Fontes <noah.fontes@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function relaxNGValidate($filename)
-	{
-		$luie = libxml_use_internal_errors(true);
-		libxml_clear_errors();
-		
-		// gotta do the @ to suppress PHP warnings when the schema cannot be loaded or is invalid
-		if(!$result = @parent::relaxNGValidate($filename)) {
-			$errors = array();
-			foreach(libxml_get_errors() as $error) {
-				$errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
-			}
-			libxml_clear_errors();
-			libxml_use_internal_errors($luie);
-			throw new \DOMException(
-				sprintf(
-					'RELAX NG validation with "%s" failed due to the following error%s: ' . "\n\n%s",
-					$filename,
-					count($errors) > 1 ? 's' : '', 
-					implode("\n", $errors)
-				)
-			);
-		}
-		
-		libxml_use_internal_errors($luie);
-		
-		return $result;
-	}
+    /**
+     * Perform RELAX NG validation on the document.
+     *
+     * @param      string $filename The path to the schema.
+     *
+     * @return     bool True if the validation is successful; false otherwise.
+     *
+     * @author     Noah Fontes <noah.fontes@bitextender.com>
+     * @since      1.0.0
+     */
+    public function relaxNGValidate($filename)
+    {
+        $luie = libxml_use_internal_errors(true);
+        libxml_clear_errors();
+		
+        // gotta do the @ to suppress PHP warnings when the schema cannot be loaded or is invalid
+        if(!$result = @parent::relaxNGValidate($filename)) {
+            $errors = array();
+            foreach(libxml_get_errors() as $error) {
+                $errors[] = sprintf('[%s #%d] Line %d: %s', $error->level == LIBXML_ERR_WARNING ? 'Warning' : ($error->level == LIBXML_ERR_ERROR ? 'Error' : 'Fatal'), $error->code, $error->line, $error->message);
+            }
+            libxml_clear_errors();
+            libxml_use_internal_errors($luie);
+            throw new \DOMException(
+                sprintf(
+                    'RELAX NG validation with "%s" failed due to the following error%s: ' . "\n\n%s",
+                    $filename,
+                    count($errors) > 1 ? 's' : '', 
+                    implode("\n", $errors)
+                )
+            );
+        }
+		
+        libxml_use_internal_errors($luie);
+		
+        return $result;
+    }
 	
-	/**
-	 * Retrieve the DOMXPath instance that is associated with this document.
-	 *
-	 * @return     \DOMXPath The DOMXPath instance.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      1.0.0
-	 */
-	public function getXpath()
-	{
-		return $this->xpath;
-	}
+    /**
+     * Retrieve the DOMXPath instance that is associated with this document.
+     *
+     * @return     \DOMXPath The DOMXPath instance.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      1.0.0
+     */
+    public function getXpath()
+    {
+        return $this->xpath;
+    }
 	
-	/**
-	 * Set a default namespace that should be used when accessing elements via
-	 * convenience methods (such as magic get overload for children), and bind it
-	 * to the given prefix for use in XPath expressions.
-	 *
-	 * @param      string $namespaceUri A namespace URI
-	 * @param      string $prefix       An optional prefix, defaulting to "_default"
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      1.0.0
-	 */
-	public function setDefaultNamespace($namespaceUri, $prefix = '_default')
-	{
-		$this->defaultNamespaceUri = $namespaceUri;
-		$this->defaultNamespacePrefix = $prefix;
-		
-		$this->xpath->registerNamespace($prefix, $namespaceUri);
-	}
+    /**
+     * Set a default namespace that should be used when accessing elements via
+     * convenience methods (such as magic get overload for children), and bind it
+     * to the given prefix for use in XPath expressions.
+     *
+     * @param      string $namespaceUri A namespace URI
+     * @param      string $prefix       An optional prefix, defaulting to "_default"
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      1.0.0
+     */
+    public function setDefaultNamespace($namespaceUri, $prefix = '_default')
+    {
+        $this->defaultNamespaceUri = $namespaceUri;
+        $this->defaultNamespacePrefix = $prefix;
+		
+        $this->xpath->registerNamespace($prefix, $namespaceUri);
+    }
 	
-	/**
-	 * Retrieve the default namespace URI that will be used by node classes, if
-	 * set, to conveniently retrieve child elements etc in some methods.
-	 *
-	 * @return     string A namespace URI.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      1.0.0
-	 */
-	public function getDefaultNamespaceUri()
-	{
-		return $this->defaultNamespaceUri;
-	}
+    /**
+     * Retrieve the default namespace URI that will be used by node classes, if
+     * set, to conveniently retrieve child elements etc in some methods.
+     *
+     * @return     string A namespace URI.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      1.0.0
+     */
+    public function getDefaultNamespaceUri()
+    {
+        return $this->defaultNamespaceUri;
+    }
 	
-	/**
-	 * Retrieve the default namespace prefix that will be used by node classes, if
-	 * set, to conveniently retrieve child elements etc via XPath. 
-	 *
-	 * @return     string A namespace prefix.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      1.0.0
-	 */
-	public function getDefaultNamespacePrefix()
-	{
-		return $this->defaultNamespacePrefix;
-	}
+    /**
+     * Retrieve the default namespace prefix that will be used by node classes, if
+     * set, to conveniently retrieve child elements etc via XPath. 
+     *
+     * @return     string A namespace prefix.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      1.0.0
+     */
+    public function getDefaultNamespacePrefix()
+    {
+        return $this->defaultNamespacePrefix;
+    }
 	
-	/**
-	 * Check whether or not this is a standard Agavi configuration file, i.e. with
-	 * a <configurations> and <configuration> envelope.
-	 *
-	 * @return     bool true, if it is an Agavi config structure, false otherwise.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      1.0.0
-	 */
-	public function isAgaviConfiguration()
-	{
-		return XmlConfigParser::isAgaviConfigurationDocument($this);
-	}
+    /**
+     * Check whether or not this is a standard Agavi configuration file, i.e. with
+     * a <configurations> and <configuration> envelope.
+     *
+     * @return     bool true, if it is an Agavi config structure, false otherwise.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      1.0.0
+     */
+    public function isAgaviConfiguration()
+    {
+        return XmlConfigParser::isAgaviConfigurationDocument($this);
+    }
 	
-	/**
-	 * Retrieve the namespace of the Agavi envelope.
-	 *
-	 * @return     string A namespace URI, or null if it's not an Agavi config.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      1.0.0
-	 */
-	public function getAgaviEnvelopeNamespace()
-	{
-		if($this->isAgaviConfiguration()) {
-			return $this->documentElement->namespaceURI;
-		}
-	}
+    /**
+     * Retrieve the namespace of the Agavi envelope.
+     *
+     * @return     string A namespace URI, or null if it's not an Agavi config.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      1.0.0
+     */
+    public function getAgaviEnvelopeNamespace()
+    {
+        if($this->isAgaviConfiguration()) {
+            return $this->documentElement->namespaceURI;
+        }
+    }
 	
-	/**
-	 * Method to retrieve a list of Agavi <configuration> elements regardless of
-	 * their namespace.
-	 *
-	 * @return     XmlConfigDomElement[] A list of XmlConfigDomElement elements.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      1.0.0
-	 */
-	public function getConfigurationElements()
-	{
-		$retval = array();
-		
-		if($this->isAgaviConfiguration()) {
-			$agaviNs = $this->getAgaviEnvelopeNamespace();
+    /**
+     * Method to retrieve a list of Agavi <configuration> elements regardless of
+     * their namespace.
+     *
+     * @return     XmlConfigDomElement[] A list of XmlConfigDomElement elements.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      1.0.0
+     */
+    public function getConfigurationElements()
+    {
+        $retval = array();
+		
+        if($this->isAgaviConfiguration()) {
+            $agaviNs = $this->getAgaviEnvelopeNamespace();
 			
-			foreach($this->documentElement->childNodes as $node) {
-				if($node->nodeType == XML_ELEMENT_NODE && $node->localName == 'configuration' && $node->namespaceURI == $agaviNs) {
-					$retval[] = $node;
-				}
-			}
-		}
-		
-		return $retval;
-	}
+            foreach($this->documentElement->childNodes as $node) {
+                if($node->nodeType == XML_ELEMENT_NODE && $node->localName == 'configuration' && $node->namespaceURI == $agaviNs) {
+                    $retval[] = $node;
+                }
+            }
+        }
+		
+        return $retval;
+    }
 	
-	/**
-	 * Method to retrieve the Agavi <sandbox> element regardless of the namespace.
-	 *
-	 * @return     XmlConfigDomElement The <sandbox> element, or null.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      1.0.0
-	 */
-	public function getSandbox()
-	{
-		if($this->isAgaviConfiguration()) {
-			$agaviNs = $this->getAgaviEnvelopeNamespace();
+    /**
+     * Method to retrieve the Agavi <sandbox> element regardless of the namespace.
+     *
+     * @return     XmlConfigDomElement The <sandbox> element, or null.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      1.0.0
+     */
+    public function getSandbox()
+    {
+        if($this->isAgaviConfiguration()) {
+            $agaviNs = $this->getAgaviEnvelopeNamespace();
 			
-			foreach($this->documentElement->childNodes as $node) {
-				if($node->nodeType == XML_ELEMENT_NODE && $node->localName == 'sandbox' && $node->namespaceURI == $agaviNs) {
-					return $node;
-				}
-			}
-		}
-	}
+            foreach($this->documentElement->childNodes as $node) {
+                if($node->nodeType == XML_ELEMENT_NODE && $node->localName == 'sandbox' && $node->namespaceURI == $agaviNs) {
+                    return $node;
+                }
+            }
+        }
+    }
 }
 
 ?>
\ No newline at end of file

src/config/util/dom/XmlConfigDomElement.class.php

Doc Comments +3 added lines, -2 removed lines

@@ -180,7 +180,7 @@ 
 	 *                                  namespace will be used. If an empty string, no namespace
 	 *                                  will be used.
 	 *
-	 * @return     XmlConfigDomElement[] A list of the child elements.
+	 * @return     \DOMNodeList A list of the child elements.
 	 *
 	 * @author     David Zülke <david.zuelke@bitextender.com>
 	 * @since      1.0.0
@@ -439,7 +439,7 @@ 
 	 * @param      string $localName    An attribute name.
 	 * @param      mixed  $default      A default attribute value.
 	 *
-	 * @return     mixed An attribute value, if the attribute exists, otherwise
+	 * @return     string An attribute value, if the attribute exists, otherwise
 	 *                   null or the given default.
 	 *
 	 * @see        DOMElement::getAttributeNS()
@@ -474,6 +474,7 @@ 
 	/**
 	 * Retrieve all attributes of the element that are in the given namespace.
 	 *
+	 * @param string $namespaceUri
 	 * @return     array An associative array of attribute names and values.
 	 *
 	 * @author     David Zülke <david.zuelke@bitextender.com>

Spacing +20 added lines, -20 removed lines

@@ -111,8 +111,8 @@ 
 		$preserveWhitespace = $this->getAttributeNS(XmlConfigParser::NAMESPACE_XML_1998, 'space') == 'preserve';
 		$literalize = Toolkit::literalize($this->getAttributeNS(XmlConfigParser::NAMESPACE_AGAVI_ENVELOPE_LATEST, 'literalize')) !== false;
 		
-		if($literalize) {
-			if($preserveWhitespace && ($trimmedValue === '' || $value != $trimmedValue)) {
+		if ($literalize) {
+			if ($preserveWhitespace && ($trimmedValue === '' || $value != $trimmedValue)) {
 				// we must preserve whitespace, and there is leading or trailing whitespace in the original value, so we won't run Toolkit::literalize(), which trims the input and then converts "true" to a boolean and so forth
 				// however, we should still expand possible occurrences of config directives
 				$value = Toolkit::expandDirectives($value);
@@ -120,9 +120,9 @@ 
 				// no need to preserve whitespace, or no leading/trailing whitespace, which means we can expand "true", "false" and so forth using Toolkit::literalize()
 				$value = Toolkit::literalize($trimmedValue);
 			}
-		} elseif(!$preserveWhitespace) {
+		} elseif (!$preserveWhitespace) {
 			$value = $trimmedValue;
-			if($value === '') {
+			if ($value === '') {
 				// with or without literalize, an empty string must be converted to NULL if xml:space is default (see ticket #1203 and AEP-100)
 				$value = null;
 			}
@@ -143,7 +143,7 @@ 
 	{
 		// should only pull elements from the default ns
 		$prefix = $this->ownerDocument->getDefaultNamespacePrefix();
-		if($prefix) {
+		if ($prefix) {
 			return $this->ownerDocument->getXpath()->query(sprintf('child::%s:*', $prefix), $this);
 		} else {
 			return $this->ownerDocument->getXpath()->query('child::*', $this);
@@ -242,16 +242,16 @@ 
 		$marker = uniqid('', true);
 		$this->setAttributeNS(XmlConfigParser::NAMESPACE_AGAVI_ANNOTATIONS_LATEST, 'agavi_annotations_latest:marker', $marker);
 		
-		if($pluralMagic) {
+		if ($pluralMagic) {
 			// we always assume that we either get plural names, or the singular of the singular is not different from the singular :)
 			$singularName = $this->singularize($name);
-			if($namespaceUri) {
+			if ($namespaceUri) {
 				$query = 'count(child::*[local-name() = "%2$s" and namespace-uri() = "%3$s" and ../@agavi_annotations_latest:marker = "%4$s"]) + count(child::*[local-name() = "%1$s" and namespace-uri() = "%3$s" and ../@agavi_annotations_latest:marker = "%4$s"]/*[local-name() = "%2$s" and namespace-uri() = "%3$s" and ../../@agavi_annotations_latest:marker = "%4$s"])';
 			} else {
 				$query = 'count(%1$s[../@agavi_annotations_latest:marker = "%4$s"]/%2$s[../../@agavi_annotations_latest:marker = "%4$s"]) + count(%2$s[../@agavi_annotations_latest:marker = "%4$s"])';
 			}
 		} else {
-			if($namespaceUri) {
+			if ($namespaceUri) {
 				$query = 'count(child::*[local-name() = "%1$s" and namespace-uri() = "%3$s" and ../@agavi_annotations_latest:marker = "%4$s"])';
 			} else {
 				$query = 'count(%1$s[../@agavi_annotations_latest:marker = "%4$s"])';
@@ -318,16 +318,16 @@ 
 		$marker = uniqid('', true);
 		$this->setAttributeNS(XmlConfigParser::NAMESPACE_AGAVI_ANNOTATIONS_LATEST, 'agavi_annotations_latest:marker', $marker);
 		
-		if($pluralMagic) {
+		if ($pluralMagic) {
 			// we always assume that we either get plural names, or the singular of the singular is not different from the singular :)
 			$singularName = $this->singularize($name);
-			if($namespaceUri) {
+			if ($namespaceUri) {
 				$query = 'child::*[local-name() = "%2$s" and namespace-uri() = "%3$s" and ../@agavi_annotations_latest:marker = "%4$s"] | child::*[local-name() = "%1$s" and namespace-uri() = "%3$s" and ../@agavi_annotations_latest:marker = "%4$s"]/*[local-name() = "%2$s" and namespace-uri() = "%3$s" and ../../@agavi_annotations_latest:marker = "%4$s"]';
 			} else {
 				$query = '%1$s[../@agavi_annotations_latest:marker = "%4$s"]/%2$s[../../@agavi_annotations_latest:marker = "%4$s"] | %2$s[../@agavi_annotations_latest:marker = "%4$s"]';
 			}
 		} else {
-			if($namespaceUri) {
+			if ($namespaceUri) {
 				$query = 'child::*[local-name() = "%1$s" and namespace-uri() = "%3$s" and ../@agavi_annotations_latest:marker = "%4$s"]';
 			} else {
 				$query = '%1$s[../@agavi_annotations_latest:marker = "%4$s"]';
@@ -388,7 +388,7 @@ 
 		$marker = uniqid('', true);
 		$this->setAttributeNS(XmlConfigParser::NAMESPACE_AGAVI_ANNOTATIONS_LATEST, 'agavi_annotations_latest:marker', $marker);
 		
-		if($namespaceUri) {
+		if ($namespaceUri) {
 			$query = 'self::node()[count(child::*[local-name() = "%1$s" and namespace-uri() = "%2$s" and ../@agavi_annotations_latest:marker = "%3$s"]) = 1]/*[local-name() = "%1$s" and namespace-uri() = "%2$s" and ../@agavi_annotations_latest:marker = "%3$s"]';
 		} else {
 			$query = 'self::node()[count(child::%1$s[../@agavi_annotations_latest:marker = "%3$s"]) = 1]/%1$s[../@agavi_annotations_latest:marker = "%3$s"]';
@@ -423,7 +423,7 @@ 
 		
 		// getAttribute returns '' when the attribute doesn't exist, but any
 		// null-ish value is probably unacceptable anyway
-		if($retval == null) {
+		if ($retval == null) {
 			$retval = $default;
 		}
 		
@@ -451,7 +451,7 @@ 
 	{
 		$retval = parent::getAttributeNS($namespaceUri, $localName);
 		
-		if($retval === null) {
+		if ($retval === null) {
 			$retval = $default;
 		}
 		
@@ -483,7 +483,7 @@ 
 	{
 		$retval = array();
 		
-		foreach($this->ownerDocument->getXpath()->query(sprintf('@*[namespace-uri() = "%s"]', $namespaceUri), $this) as $attribute) {
+		foreach ($this->ownerDocument->getXpath()->query(sprintf('@*[namespace-uri() = "%s"]', $namespaceUri), $this) as $attribute) {
 			$retval[$attribute->localName] = $attribute->nodeValue;
 		}
 		
@@ -500,7 +500,7 @@ 
 	 */
 	public function hasAgaviParameters()
 	{
-		if($this->ownerDocument->isAgaviConfiguration()) {
+		if ($this->ownerDocument->isAgaviConfiguration()) {
 			return $this->has('parameters', XmlConfigParser::NAMESPACE_AGAVI_ENVELOPE_LATEST);
 		}
 		
@@ -524,19 +524,19 @@ 
 		$result = $existing;
 		$offset = 0;
 		
-		if($this->ownerDocument->isAgaviConfiguration()) {
+		if ($this->ownerDocument->isAgaviConfiguration()) {
 			$elements = $this->get('parameters', XmlConfigParser::NAMESPACE_AGAVI_ENVELOPE_LATEST);
 
 			/** @var XmlConfigDomElement $element */
-			foreach($elements as $element) {
+			foreach ($elements as $element) {
 				$key = null;
-				if(!$element->hasAttribute('name')) {
+				if (!$element->hasAttribute('name')) {
 					$result[$key = $offset++] = null;
 				} else {
 					$key = $element->getAttribute('name');
 				}
 				
-				if($element->hasAgaviParameters()) {
+				if ($element->hasAgaviParameters()) {
 					$result[$key] = isset($result[$key]) && is_array($result[$key]) ? $result[$key] : array();
 					$result[$key] = $element->getAgaviParameters($result[$key]);
 				} else {

Indentation +463 added lines, -463 removed lines

@@ -36,517 +36,517 @@
 class XmlConfigDomElement extends \DOMElement implements \IteratorAggregate
 {
 
-	/**
-	 * __toString() magic method, returns the element value.
-	 *
-	 * @see        AgaviXmlConfigDomElement::getValue()
-	 *
-	 * @return     string The element value.
-	 *
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function __toString()
-	{
-		return $this->getValue();
-	}
+    /**
+     * __toString() magic method, returns the element value.
+     *
+     * @see        AgaviXmlConfigDomElement::getValue()
+     *
+     * @return     string The element value.
+     *
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.0.0
+     */
+    public function __toString()
+    {
+        return $this->getValue();
+    }
 	
-	/**
-	 * Returns the element name.
-	 *
-	 * @return     string The element name.
-	 *
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function getName()
-	{
-		// what to return here? name with prefix? no.
-		// but... element name, or with ns prefix?
-		return $this->nodeName;
-	}
+    /**
+     * Returns the element name.
+     *
+     * @return     string The element name.
+     *
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.0.0
+     */
+    public function getName()
+    {
+        // what to return here? name with prefix? no.
+        // but... element name, or with ns prefix?
+        return $this->nodeName;
+    }
 	
-	/**
-	 * Returns the element value.
-	 *
-	 * @return     string The element value.
-	 *
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function getValue()
-	{
-		// TODO: or textContent?
-		// trimmed or not? in utf-8 or native encoding?
-		// I'd really say we only support utf-8 for the new api
-		return $this->nodeValue;
-	}
+    /**
+     * Returns the element value.
+     *
+     * @return     string The element value.
+     *
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.0.0
+     */
+    public function getValue()
+    {
+        // TODO: or textContent?
+        // trimmed or not? in utf-8 or native encoding?
+        // I'd really say we only support utf-8 for the new api
+        return $this->nodeValue;
+    }
 	
-	/**
-	 * Returns the literal value. By default, that means whitespace is trimmed,
-	 * boolean literals ("on", "yes", "true", "no", "off", "false") are converted
-	 * and configuration directives ("%core.app_dir%") are expanded.
-	 *
-	 * Takes attributes {http://www.w3.org/XML/1998/namespace}space and
-	 * {http://agavi.org/agavi/config/global/envelope/1.1}literalize into account
-	 * when computing the literal value. This way, users can control the trimming
-	 * and the literalization of values.
-	 * 
-	 * AEP-100 has a list of all the conversion rules that apply.
-	 *
-	 * @return     mixed The element content converted according to the rules
-	 *                   defined in AEP-100.
-	 *
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.1.0
-	 */
-	public function getLiteralValue()
-	{
-		$value = $this->getValue();
-		// XML specifies [\x9\xA\xD\x20] as whitespace
-		// trim strips more than that
-		// no problem though, because these other chars aren't legal in XML
-		$trimmedValue = trim($value);
+    /**
+     * Returns the literal value. By default, that means whitespace is trimmed,
+     * boolean literals ("on", "yes", "true", "no", "off", "false") are converted
+     * and configuration directives ("%core.app_dir%") are expanded.
+     *
+     * Takes attributes {http://www.w3.org/XML/1998/namespace}space and
+     * {http://agavi.org/agavi/config/global/envelope/1.1}literalize into account
+     * when computing the literal value. This way, users can control the trimming
+     * and the literalization of values.
+     * 
+     * AEP-100 has a list of all the conversion rules that apply.
+     *
+     * @return     mixed The element content converted according to the rules
+     *                   defined in AEP-100.
+     *
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.1.0
+     */
+    public function getLiteralValue()
+    {
+        $value = $this->getValue();
+        // XML specifies [\x9\xA\xD\x20] as whitespace
+        // trim strips more than that
+        // no problem though, because these other chars aren't legal in XML
+        $trimmedValue = trim($value);
 		
-		$preserveWhitespace = $this->getAttributeNS(XmlConfigParser::NAMESPACE_XML_1998, 'space') == 'preserve';
-		$literalize = Toolkit::literalize($this->getAttributeNS(XmlConfigParser::NAMESPACE_AGAVI_ENVELOPE_LATEST, 'literalize')) !== false;
+        $preserveWhitespace = $this->getAttributeNS(XmlConfigParser::NAMESPACE_XML_1998, 'space') == 'preserve';
+        $literalize = Toolkit::literalize($this->getAttributeNS(XmlConfigParser::NAMESPACE_AGAVI_ENVELOPE_LATEST, 'literalize')) !== false;
 		
-		if($literalize) {
-			if($preserveWhitespace && ($trimmedValue === '' || $value != $trimmedValue)) {
-				// we must preserve whitespace, and there is leading or trailing whitespace in the original value, so we won't run Toolkit::literalize(), which trims the input and then converts "true" to a boolean and so forth
-				// however, we should still expand possible occurrences of config directives
-				$value = Toolkit::expandDirectives($value);
-			} else {
-				// no need to preserve whitespace, or no leading/trailing whitespace, which means we can expand "true", "false" and so forth using Toolkit::literalize()
-				$value = Toolkit::literalize($trimmedValue);
-			}
-		} elseif(!$preserveWhitespace) {
-			$value = $trimmedValue;
-			if($value === '') {
-				// with or without literalize, an empty string must be converted to NULL if xml:space is default (see ticket #1203 and AEP-100)
-				$value = null;
-			}
-		}
+        if($literalize) {
+            if($preserveWhitespace && ($trimmedValue === '' || $value != $trimmedValue)) {
+                // we must preserve whitespace, and there is leading or trailing whitespace in the original value, so we won't run Toolkit::literalize(), which trims the input and then converts "true" to a boolean and so forth
+                // however, we should still expand possible occurrences of config directives
+                $value = Toolkit::expandDirectives($value);
+            } else {
+                // no need to preserve whitespace, or no leading/trailing whitespace, which means we can expand "true", "false" and so forth using Toolkit::literalize()
+                $value = Toolkit::literalize($trimmedValue);
+            }
+        } elseif(!$preserveWhitespace) {
+            $value = $trimmedValue;
+            if($value === '') {
+                // with or without literalize, an empty string must be converted to NULL if xml:space is default (see ticket #1203 and AEP-100)
+                $value = null;
+            }
+        }
 		
-		return $value;
-	}
+        return $value;
+    }
 	
-	/**
-	 * Returns an iterator for the child nodes.
-	 *
-	 * @return     \Iterator An iterator.
-	 *
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function getIterator()
-	{
-		// should only pull elements from the default ns
-		$prefix = $this->ownerDocument->getDefaultNamespacePrefix();
-		if($prefix) {
-			return $this->ownerDocument->getXpath()->query(sprintf('child::%s:*', $prefix), $this);
-		} else {
-			return $this->ownerDocument->getXpath()->query('child::*', $this);
-		}
-	}
+    /**
+     * Returns an iterator for the child nodes.
+     *
+     * @return     \Iterator An iterator.
+     *
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.0.0
+     */
+    public function getIterator()
+    {
+        // should only pull elements from the default ns
+        $prefix = $this->ownerDocument->getDefaultNamespacePrefix();
+        if($prefix) {
+            return $this->ownerDocument->getXpath()->query(sprintf('child::%s:*', $prefix), $this);
+        } else {
+            return $this->ownerDocument->getXpath()->query('child::*', $this);
+        }
+    }
 	
-	/**
-	 * Retrieve singular form of given element name.
-	 * This does special splitting only of the last part of the name if the name
-	 * of the element contains hyphens, underscores or dots.
-	 *
-	 * @param      string $name The element name to singularize.
-	 *
-	 * @return     string The singularized element name.
-	 *
-	 * @author     Noah Fontes <noah.fontes@bitextender.com>
-	 * @since      1.0.0
-	 */
-	protected function singularize($name)
-	{
-		// TODO: shouldn't this be static?
-		$names = preg_split('#([_\-\.])#', $name, -1, PREG_SPLIT_DELIM_CAPTURE);
-		$names[count($names) - 1] = Inflector::singularize(end($names));
-		return implode('', $names);
-	}
+    /**
+     * Retrieve singular form of given element name.
+     * This does special splitting only of the last part of the name if the name
+     * of the element contains hyphens, underscores or dots.
+     *
+     * @param      string $name The element name to singularize.
+     *
+     * @return     string The singularized element name.
+     *
+     * @author     Noah Fontes <noah.fontes@bitextender.com>
+     * @since      1.0.0
+     */
+    protected function singularize($name)
+    {
+        // TODO: shouldn't this be static?
+        $names = preg_split('#([_\-\.])#', $name, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $names[count($names) - 1] = Inflector::singularize(end($names));
+        return implode('', $names);
+    }
 	
-	/**
-	 * Convenience method to retrieve child elements of the given name.
-	 * Accepts singular or plural forms of the name, and will detect and handle
-	 * parent containers with plural names properly.
-	 *
-	 * @param      string $name         The name of the element(s) to check for.
-	 * @param      string $namespaceUri The namespace URI. If null, the document default
-	 *                                  namespace will be used. If an empty string, no namespace
-	 *                                  will be used.
-	 *
-	 * @return     XmlConfigDomElement[] A list of the child elements.
-	 *
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function get($name, $namespaceUri = null)
-	{
-		return $this->getChildren($name, $namespaceUri, true);
-	}
+    /**
+     * Convenience method to retrieve child elements of the given name.
+     * Accepts singular or plural forms of the name, and will detect and handle
+     * parent containers with plural names properly.
+     *
+     * @param      string $name         The name of the element(s) to check for.
+     * @param      string $namespaceUri The namespace URI. If null, the document default
+     *                                  namespace will be used. If an empty string, no namespace
+     *                                  will be used.
+     *
+     * @return     XmlConfigDomElement[] A list of the child elements.
+     *
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.0.0
+     */
+    public function get($name, $namespaceUri = null)
+    {
+        return $this->getChildren($name, $namespaceUri, true);
+    }
 	
-	/**
-	 * Convenience method to check if there are child elements of the given name.
-	 * Accepts singular or plural forms of the name, and will detect and handle
-	 * parent containers with plural names properly.
-	 *
-	 * @param      string $name         The name of the element(s) to check for.
-	 * @param      string $namespaceUri The namespace URI. If null, the document default
-	 *                                  namespace will be used. If an empty string, no namespace
-	 *                                  will be used.
-	 *
-	 * @return     bool True if one or more child elements with the given name
-	 *                  exist, false otherwise.
-	 *
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function has($name, $namespaceUri = null)
-	{
-		return $this->hasChildren($name, $namespaceUri, true);
-	}
+    /**
+     * Convenience method to check if there are child elements of the given name.
+     * Accepts singular or plural forms of the name, and will detect and handle
+     * parent containers with plural names properly.
+     *
+     * @param      string $name         The name of the element(s) to check for.
+     * @param      string $namespaceUri The namespace URI. If null, the document default
+     *                                  namespace will be used. If an empty string, no namespace
+     *                                  will be used.
+     *
+     * @return     bool True if one or more child elements with the given name
+     *                  exist, false otherwise.
+     *
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.0.0
+     */
+    public function has($name, $namespaceUri = null)
+    {
+        return $this->hasChildren($name, $namespaceUri, true);
+    }
 	
-	/**
-	 * Count the number of child elements with a given name.
-	 *
-	 * @param      string $name         The name of the element.
-	 * @param      string $namespaceUri The namespace URI. If null, the document default
-	 *                                  namespace will be used. If an empty string, no namespace
-	 *                                  will be used.
-	 * @param      bool   $pluralMagic  Whether or not to apply automatic singular/plural
-	 *                                  handling that skips plural container elements.
-	 *
-	 * @return     int The number of child elements with the given name.
-	 *
-	 * @author     Noah Fontes <noah.fontes@bitextender.com>
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function countChildren($name, $namespaceUri = null, $pluralMagic = false)
-	{
-		// if arg is null, then only check for elements from our default namespace
-		// if namespace uri is null, use default ns. if empty string, use no ns
-		$namespaceUri = ($namespaceUri === null ? $this->ownerDocument->getDefaultNamespaceUri() : $namespaceUri);
+    /**
+     * Count the number of child elements with a given name.
+     *
+     * @param      string $name         The name of the element.
+     * @param      string $namespaceUri The namespace URI. If null, the document default
+     *                                  namespace will be used. If an empty string, no namespace
+     *                                  will be used.
+     * @param      bool   $pluralMagic  Whether or not to apply automatic singular/plural
+     *                                  handling that skips plural container elements.
+     *
+     * @return     int The number of child elements with the given name.
+     *
+     * @author     Noah Fontes <noah.fontes@bitextender.com>
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.0.0
+     */
+    public function countChildren($name, $namespaceUri = null, $pluralMagic = false)
+    {
+        // if arg is null, then only check for elements from our default namespace
+        // if namespace uri is null, use default ns. if empty string, use no ns
+        $namespaceUri = ($namespaceUri === null ? $this->ownerDocument->getDefaultNamespaceUri() : $namespaceUri);
 		
-		// init our vars
-		$query = '';
-		$singularName = null;
+        // init our vars
+        $query = '';
+        $singularName = null;
 		
-		// tag our element, because older libxmls will mess things up otherwise
-		// http://trac.agavi.org/ticket/1039
-		$marker = uniqid('', true);
-		$this->setAttributeNS(XmlConfigParser::NAMESPACE_AGAVI_ANNOTATIONS_LATEST, 'agavi_annotations_latest:marker', $marker);
+        // tag our element, because older libxmls will mess things up otherwise
+        // http://trac.agavi.org/ticket/1039
+        $marker = uniqid('', true);
+        $this->setAttributeNS(XmlConfigParser::NAMESPACE_AGAVI_ANNOTATIONS_LATEST, 'agavi_annotations_latest:marker', $marker);
 		
-		if($pluralMagic) {
-			// we always assume that we either get plural names, or the singular of the singular is not different from the singular :)
-			$singularName = $this->singularize($name);
-			if($namespaceUri) {
-				$query = 'count(child::*[local-name() = "%2$s" and namespace-uri() = "%3$s" and ../@agavi_annotations_latest:marker = "%4$s"]) + count(child::*[local-name() = "%1$s" and namespace-uri() = "%3$s" and ../@agavi_annotations_latest:marker = "%4$s"]/*[local-name() = "%2$s" and namespace-uri() = "%3$s" and ../../@agavi_annotations_latest:marker = "%4$s"])';
-			} else {
-				$query = 'count(%1$s[../@agavi_annotations_latest:marker = "%4$s"]/%2$s[../../@agavi_annotations_latest:marker = "%4$s"]) + count(%2$s[../@agavi_annotations_latest:marker = "%4$s"])';
-			}
-		} else {
-			if($namespaceUri) {
-				$query = 'count(child::*[local-name() = "%1$s" and namespace-uri() = "%3$s" and ../@agavi_annotations_latest:marker = "%4$s"])';
-			} else {
-				$query = 'count(%1$s[../@agavi_annotations_latest:marker = "%4$s"])';
-			}
-		}
+        if($pluralMagic) {
+            // we always assume that we either get plural names, or the singular of the singular is not different from the singular :)
+            $singularName = $this->singularize($name);
+            if($namespaceUri) {
+                $query = 'count(child::*[local-name() = "%2$s" and namespace-uri() = "%3$s" and ../@agavi_annotations_latest:marker = "%4$s"]) + count(child::*[local-name() = "%1$s" and namespace-uri() = "%3$s" and ../@agavi_annotations_latest:marker = "%4$s"]/*[local-name() = "%2$s" and namespace-uri() = "%3$s" and ../../@agavi_annotations_latest:marker = "%4$s"])';
+            } else {
+                $query = 'count(%1$s[../@agavi_annotations_latest:marker = "%4$s"]/%2$s[../../@agavi_annotations_latest:marker = "%4$s"]) + count(%2$s[../@agavi_annotations_latest:marker = "%4$s"])';
+            }
+        } else {
+            if($namespaceUri) {
+                $query = 'count(child::*[local-name() = "%1$s" and namespace-uri() = "%3$s" and ../@agavi_annotations_latest:marker = "%4$s"])';
+            } else {
+                $query = 'count(%1$s[../@agavi_annotations_latest:marker = "%4$s"])';
+            }
+        }
 		
-		$retval = (int)$this->ownerDocument->getXpath()->evaluate(sprintf($query, $name, $singularName, $namespaceUri, $marker), $this);
+        $retval = (int)$this->ownerDocument->getXpath()->evaluate(sprintf($query, $name, $singularName, $namespaceUri, $marker), $this);
 		
-		$this->removeAttributeNS(XmlConfigParser::NAMESPACE_AGAVI_ANNOTATIONS_LATEST, 'agavi_annotations_latest:marker');
+        $this->removeAttributeNS(XmlConfigParser::NAMESPACE_AGAVI_ANNOTATIONS_LATEST, 'agavi_annotations_latest:marker');
 		
-		return $retval;
-	}
+        return $retval;
+    }
 	
-	/**
-	 * Determine whether there is at least one instance of a child element with a
-	 * given name.
-	 *
-	 * @param      string $name         The name of the element.
-	 * @param      string $namespaceUri The namespace URI. If null, the document default
-	 *                                  namespace will be used. If an empty string, no namespace
-	 *                                  will be used.
-	 * @param      bool   $pluralMagic  Whether or not to apply automatic singular/plural
-	 *                                  handling that skips plural container elements.
-	 *
-	 * @return     bool True if one or more child elements with the given name
-	 *                  exist, false otherwise.
-	 *
-	 * @author     Noah Fontes <noah.fontes@bitextender.com>
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function hasChildren($name, $namespaceUri = null, $pluralMagic = false)
-	{
-		return $this->countChildren($name, $namespaceUri, $pluralMagic) !== 0;
-	}
+    /**
+     * Determine whether there is at least one instance of a child element with a
+     * given name.
+     *
+     * @param      string $name         The name of the element.
+     * @param      string $namespaceUri The namespace URI. If null, the document default
+     *                                  namespace will be used. If an empty string, no namespace
+     *                                  will be used.
+     * @param      bool   $pluralMagic  Whether or not to apply automatic singular/plural
+     *                                  handling that skips plural container elements.
+     *
+     * @return     bool True if one or more child elements with the given name
+     *                  exist, false otherwise.
+     *
+     * @author     Noah Fontes <noah.fontes@bitextender.com>
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.0.0
+     */
+    public function hasChildren($name, $namespaceUri = null, $pluralMagic = false)
+    {
+        return $this->countChildren($name, $namespaceUri, $pluralMagic) !== 0;
+    }
 	
-	/**
-	 * Retrieve all children with the given element name.
-	 *
-	 * @param      string $name         The name of the element.
-	 * @param      string $namespaceUri The namespace URI. If null, the document default
-	 *                                  namespace will be used. If an empty string, no namespace
-	 *                                  will be used.
-	 * @param      bool   $pluralMagic  Whether or not to apply automatic singular/plural
-	 *                                  handling that skips plural container elements.
-	 *
-	 * @return     \DOMNodeList A list of the child elements.
-	 *
-	 * @author     Noah Fontes <noah.fontes@bitextender.com>
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function getChildren($name, $namespaceUri = null, $pluralMagic = false)
-	{
-		// if arg is null, then only check for elements from our default namespace
-		// if namespace uri is null, use default ns. if empty string, use no ns
-		$namespaceUri = ($namespaceUri === null ? $this->ownerDocument->getDefaultNamespaceUri() : $namespaceUri);
+    /**
+     * Retrieve all children with the given element name.
+     *
+     * @param      string $name         The name of the element.
+     * @param      string $namespaceUri The namespace URI. If null, the document default
+     *                                  namespace will be used. If an empty string, no namespace
+     *                                  will be used.
+     * @param      bool   $pluralMagic  Whether or not to apply automatic singular/plural
+     *                                  handling that skips plural container elements.
+     *
+     * @return     \DOMNodeList A list of the child elements.
+     *
+     * @author     Noah Fontes <noah.fontes@bitextender.com>
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.0.0
+     */
+    public function getChildren($name, $namespaceUri = null, $pluralMagic = false)
+    {
+        // if arg is null, then only check for elements from our default namespace
+        // if namespace uri is null, use default ns. if empty string, use no ns
+        $namespaceUri = ($namespaceUri === null ? $this->ownerDocument->getDefaultNamespaceUri() : $namespaceUri);
 		
-		// init our vars
-		$query = '';
-		$singularName = null;
+        // init our vars
+        $query = '';
+        $singularName = null;
 		
-		// tag our element, because libxml will mess things up otherwise
-		$marker = uniqid('', true);
-		$this->setAttributeNS(XmlConfigParser::NAMESPACE_AGAVI_ANNOTATIONS_LATEST, 'agavi_annotations_latest:marker', $marker);
+        // tag our element, because libxml will mess things up otherwise
+        $marker = uniqid('', true);
+        $this->setAttributeNS(XmlConfigParser::NAMESPACE_AGAVI_ANNOTATIONS_LATEST, 'agavi_annotations_latest:marker', $marker);
 		
-		if($pluralMagic) {
-			// we always assume that we either get plural names, or the singular of the singular is not different from the singular :)
-			$singularName = $this->singularize($name);
-			if($namespaceUri) {
-				$query = 'child::*[local-name() = "%2$s" and namespace-uri() = "%3$s" and ../@agavi_annotations_latest:marker = "%4$s"] | child::*[local-name() = "%1$s" and namespace-uri() = "%3$s" and ../@agavi_annotations_latest:marker = "%4$s"]/*[local-name() = "%2$s" and namespace-uri() = "%3$s" and ../../@agavi_annotations_latest:marker = "%4$s"]';
-			} else {
-				$query = '%1$s[../@agavi_annotations_latest:marker = "%4$s"]/%2$s[../../@agavi_annotations_latest:marker = "%4$s"] | %2$s[../@agavi_annotations_latest:marker = "%4$s"]';
-			}
-		} else {
-			if($namespaceUri) {
-				$query = 'child::*[local-name() = "%1$s" and namespace-uri() = "%3$s" and ../@agavi_annotations_latest:marker = "%4$s"]';
-			} else {
-				$query = '%1$s[../@agavi_annotations_latest:marker = "%4$s"]';
-			}
-		}
-		/** @var \DOMXPath $xpath */
-		$xpath = $this->ownerDocument->getXpath();
-		$retval = $xpath->query(sprintf($query, $name, $singularName, $namespaceUri, $marker), $this);
+        if($pluralMagic) {
+            // we always assume that we either get plural names, or the singular of the singular is not different from the singular :)
+            $singularName = $this->singularize($name);
+            if($namespaceUri) {
+                $query = 'child::*[local-name() = "%2$s" and namespace-uri() = "%3$s" and ../@agavi_annotations_latest:marker = "%4$s"] | child::*[local-name() = "%1$s" and namespace-uri() = "%3$s" and ../@agavi_annotations_latest:marker = "%4$s"]/*[local-name() = "%2$s" and namespace-uri() = "%3$s" and ../../@agavi_annotations_latest:marker = "%4$s"]';
+            } else {
+                $query = '%1$s[../@agavi_annotations_latest:marker = "%4$s"]/%2$s[../../@agavi_annotations_latest:marker = "%4$s"] | %2$s[../@agavi_annotations_latest:marker = "%4$s"]';
+            }
+        } else {
+            if($namespaceUri) {
+                $query = 'child::*[local-name() = "%1$s" and namespace-uri() = "%3$s" and ../@agavi_annotations_latest:marker = "%4$s"]';
+            } else {
+                $query = '%1$s[../@agavi_annotations_latest:marker = "%4$s"]';
+            }
+        }
+        /** @var \DOMXPath $xpath */
+        $xpath = $this->ownerDocument->getXpath();
+        $retval = $xpath->query(sprintf($query, $name, $singularName, $namespaceUri, $marker), $this);
 		
-		$this->removeAttributeNS(XmlConfigParser::NAMESPACE_AGAVI_ANNOTATIONS_LATEST, 'agavi_annotations_latest:marker');
+        $this->removeAttributeNS(XmlConfigParser::NAMESPACE_AGAVI_ANNOTATIONS_LATEST, 'agavi_annotations_latest:marker');
 		
-		return $retval;
-	}
+        return $retval;
+    }
 	
-	/**
-	 * Determine whether this element has a particular child element. This method
-	 * succeeds only when there is exactly one child element with the given name.
-	 *
-	 * @param      string $name         The name of the element.
-	 * @param      string $namespaceUri The namespace URI. If null, the document default
-	 *                                  namespace will be used. If an empty string, no namespace
-	 *                                  will be used.
-	 *
-	 * @return     bool True if there is exactly one instance of an element with
-	 *                  the given name; false otherwise.
-	 *
-	 * @author     Noah Fontes <noah.fontes@bitextender.com>
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function hasChild($name, $namespaceUri = null)
-	{
-		return $this->getChild($name, $namespaceUri) !== null;
-	}
+    /**
+     * Determine whether this element has a particular child element. This method
+     * succeeds only when there is exactly one child element with the given name.
+     *
+     * @param      string $name         The name of the element.
+     * @param      string $namespaceUri The namespace URI. If null, the document default
+     *                                  namespace will be used. If an empty string, no namespace
+     *                                  will be used.
+     *
+     * @return     bool True if there is exactly one instance of an element with
+     *                  the given name; false otherwise.
+     *
+     * @author     Noah Fontes <noah.fontes@bitextender.com>
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.0.0
+     */
+    public function hasChild($name, $namespaceUri = null)
+    {
+        return $this->getChild($name, $namespaceUri) !== null;
+    }
 	
-	/**
-	 * Return a single child element with a given name.
-	 * Only returns anything if there is exactly one child of this name.
-	 *
-	 * @param      string $name         The name of the element.
-	 * @param      string $namespaceUri The namespace URI. If null, the document default
-	 *                                  namespace will be used. If an empty string, no namespace
-	 *                                  will be used.
-	 *
-	 * @return     \DOMElement The child element, or null if none exists.
-	 *
-	 * @author     Noah Fontes <noah.fontes@bitextender.com>
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function getChild($name, $namespaceUri = null)
-	{
-		// if arg is null, then only check for elements from our default namespace
-		// if namespace uri is null, use default ns. if empty string, use no ns
-		$namespaceUri = ($namespaceUri === null ? $this->ownerDocument->getDefaultNamespaceUri() : $namespaceUri);
+    /**
+     * Return a single child element with a given name.
+     * Only returns anything if there is exactly one child of this name.
+     *
+     * @param      string $name         The name of the element.
+     * @param      string $namespaceUri The namespace URI. If null, the document default
+     *                                  namespace will be used. If an empty string, no namespace
+     *                                  will be used.
+     *
+     * @return     \DOMElement The child element, or null if none exists.
+     *
+     * @author     Noah Fontes <noah.fontes@bitextender.com>
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.0.0
+     */
+    public function getChild($name, $namespaceUri = null)
+    {
+        // if arg is null, then only check for elements from our default namespace
+        // if namespace uri is null, use default ns. if empty string, use no ns
+        $namespaceUri = ($namespaceUri === null ? $this->ownerDocument->getDefaultNamespaceUri() : $namespaceUri);
 		
-		// tag our element, because libxml will mess things up otherwise
-		$marker = uniqid('', true);
-		$this->setAttributeNS(XmlConfigParser::NAMESPACE_AGAVI_ANNOTATIONS_LATEST, 'agavi_annotations_latest:marker', $marker);
+        // tag our element, because libxml will mess things up otherwise
+        $marker = uniqid('', true);
+        $this->setAttributeNS(XmlConfigParser::NAMESPACE_AGAVI_ANNOTATIONS_LATEST, 'agavi_annotations_latest:marker', $marker);
 		
-		if($namespaceUri) {
-			$query = 'self::node()[count(child::*[local-name() = "%1$s" and namespace-uri() = "%2$s" and ../@agavi_annotations_latest:marker = "%3$s"]) = 1]/*[local-name() = "%1$s" and namespace-uri() = "%2$s" and ../@agavi_annotations_latest:marker = "%3$s"]';
-		} else {
-			$query = 'self::node()[count(child::%1$s[../@agavi_annotations_latest:marker = "%3$s"]) = 1]/%1$s[../@agavi_annotations_latest:marker = "%3$s"]';
-		}
+        if($namespaceUri) {
+            $query = 'self::node()[count(child::*[local-name() = "%1$s" and namespace-uri() = "%2$s" and ../@agavi_annotations_latest:marker = "%3$s"]) = 1]/*[local-name() = "%1$s" and namespace-uri() = "%2$s" and ../@agavi_annotations_latest:marker = "%3$s"]';
+        } else {
+            $query = 'self::node()[count(child::%1$s[../@agavi_annotations_latest:marker = "%3$s"]) = 1]/%1$s[../@agavi_annotations_latest:marker = "%3$s"]';
+        }
 		
-		$retval = $this->ownerDocument->getXpath()->query(sprintf($query, $name, $namespaceUri, $marker), $this)->item(0);
+        $retval = $this->ownerDocument->getXpath()->query(sprintf($query, $name, $namespaceUri, $marker), $this)->item(0);
 		
-		$this->removeAttributeNS(XmlConfigParser::NAMESPACE_AGAVI_ANNOTATIONS_LATEST, 'agavi_annotations_latest:marker');
+        $this->removeAttributeNS(XmlConfigParser::NAMESPACE_AGAVI_ANNOTATIONS_LATEST, 'agavi_annotations_latest:marker');
 		
-		return $retval;
-	}
+        return $retval;
+    }
 	
-	/**
-	 * Retrieve an attribute value.
-	 * Unlike DOMElement::getAttribute(), this method accepts an optional default
-	 * return value.
-	 *
-	 * @param      string $name    An attribute name.
-	 * @param      mixed  $default A default attribute value.
-	 *
-	 * @return     mixed An attribute value, if the attribute exists, otherwise
-	 *                   null or the given default.
-	 *
-	 * @see        DOMElement::getAttribute()
-	 *
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function getAttribute($name, $default = null)
-	{
-		$retval = parent::getAttribute($name);
+    /**
+     * Retrieve an attribute value.
+     * Unlike DOMElement::getAttribute(), this method accepts an optional default
+     * return value.
+     *
+     * @param      string $name    An attribute name.
+     * @param      mixed  $default A default attribute value.
+     *
+     * @return     mixed An attribute value, if the attribute exists, otherwise
+     *                   null or the given default.
+     *
+     * @see        DOMElement::getAttribute()
+     *
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.0.0
+     */
+    public function getAttribute($name, $default = null)
+    {
+        $retval = parent::getAttribute($name);
 		
-		// getAttribute returns '' when the attribute doesn't exist, but any
-		// null-ish value is probably unacceptable anyway
-		if($retval == null) {
-			$retval = $default;
-		}
+        // getAttribute returns '' when the attribute doesn't exist, but any
+        // null-ish value is probably unacceptable anyway
+        if($retval == null) {
+            $retval = $default;
+        }
 		
-		return $retval;
-	}
+        return $retval;
+    }
 	
-	/**
-	 * Retrieve a namespaced attribute value.
-	 * Unlike DOMElement::getAttributeNS(), this method accepts an optional
-	 * default return value.
-	 *
-	 * @param      string $namespaceUri A namespace URI.
-	 * @param      string $localName    An attribute name.
-	 * @param      mixed  $default      A default attribute value.
-	 *
-	 * @return     mixed An attribute value, if the attribute exists, otherwise
-	 *                   null or the given default.
-	 *
-	 * @see        DOMElement::getAttributeNS()
-	 *
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function getAttributeNS($namespaceUri, $localName, $default = null)
-	{
-		$retval = parent::getAttributeNS($namespaceUri, $localName);
+    /**
+     * Retrieve a namespaced attribute value.
+     * Unlike DOMElement::getAttributeNS(), this method accepts an optional
+     * default return value.
+     *
+     * @param      string $namespaceUri A namespace URI.
+     * @param      string $localName    An attribute name.
+     * @param      mixed  $default      A default attribute value.
+     *
+     * @return     mixed An attribute value, if the attribute exists, otherwise
+     *                   null or the given default.
+     *
+     * @see        DOMElement::getAttributeNS()
+     *
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.0.0
+     */
+    public function getAttributeNS($namespaceUri, $localName, $default = null)
+    {
+        $retval = parent::getAttributeNS($namespaceUri, $localName);
 		
-		if($retval === null) {
-			$retval = $default;
-		}
+        if($retval === null) {
+            $retval = $default;
+        }
 		
-		return $retval;
-	}
+        return $retval;
+    }
 	
-	/**
-	 * Retrieve all attributes of the element that are in no namespace.
-	 *
-	 * @return     array An associative array of attribute names and values.
-	 *
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function getAttributes()
-	{
-		return $this->getAttributesNS('');
-	}
+    /**
+     * Retrieve all attributes of the element that are in no namespace.
+     *
+     * @return     array An associative array of attribute names and values.
+     *
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.0.0
+     */
+    public function getAttributes()
+    {
+        return $this->getAttributesNS('');
+    }
 	
-	/**
-	 * Retrieve all attributes of the element that are in the given namespace.
-	 *
-	 * @return     array An associative array of attribute names and values.
-	 *
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function getAttributesNS($namespaceUri)
-	{
-		$retval = array();
+    /**
+     * Retrieve all attributes of the element that are in the given namespace.
+     *
+     * @return     array An associative array of attribute names and values.
+     *
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.0.0
+     */
+    public function getAttributesNS($namespaceUri)
+    {
+        $retval = array();
 		
-		foreach($this->ownerDocument->getXpath()->query(sprintf('@*[namespace-uri() = "%s"]', $namespaceUri), $this) as $attribute) {
-			$retval[$attribute->localName] = $attribute->nodeValue;
-		}
+        foreach($this->ownerDocument->getXpath()->query(sprintf('@*[namespace-uri() = "%s"]', $namespaceUri), $this) as $attribute) {
+            $retval[$attribute->localName] = $attribute->nodeValue;
+        }
 		
-		return $retval;
-	}
+        return $retval;
+    }
 	
-	/**
-	 * Check whether or not the element has Agavi parameters as children.
-	 *
-	 * @return     bool True, if there are parameters, false otherwise.
-	 *
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function hasAgaviParameters()
-	{
-		if($this->ownerDocument->isAgaviConfiguration()) {
-			return $this->has('parameters', XmlConfigParser::NAMESPACE_AGAVI_ENVELOPE_LATEST);
-		}
+    /**
+     * Check whether or not the element has Agavi parameters as children.
+     *
+     * @return     bool True, if there are parameters, false otherwise.
+     *
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.0.0
+     */
+    public function hasAgaviParameters()
+    {
+        if($this->ownerDocument->isAgaviConfiguration()) {
+            return $this->has('parameters', XmlConfigParser::NAMESPACE_AGAVI_ENVELOPE_LATEST);
+        }
 		
-		return false;
-	}
+        return false;
+    }
 	
-	/**
-	 * Retrieve all of the Agavi parameter elements associated with this
-	 * element.
-	 *
-	 * @param      array An array of existing parameters.
-	 *
-	 * @return     array The complete array of parameters.
-	 *
-	 * @author     Noah Fontes <noah.fontes@bitextender.com>
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function getAgaviParameters(array $existing = array())
-	{
-		$result = $existing;
-		$offset = 0;
+    /**
+     * Retrieve all of the Agavi parameter elements associated with this
+     * element.
+     *
+     * @param      array An array of existing parameters.
+     *
+     * @return     array The complete array of parameters.
+     *
+     * @author     Noah Fontes <noah.fontes@bitextender.com>
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.0.0
+     */
+    public function getAgaviParameters(array $existing = array())
+    {
+        $result = $existing;
+        $offset = 0;
 		
-		if($this->ownerDocument->isAgaviConfiguration()) {
-			$elements = $this->get('parameters', XmlConfigParser::NAMESPACE_AGAVI_ENVELOPE_LATEST);
+        if($this->ownerDocument->isAgaviConfiguration()) {
+            $elements = $this->get('parameters', XmlConfigParser::NAMESPACE_AGAVI_ENVELOPE_LATEST);
 
-			/** @var XmlConfigDomElement $element */
-			foreach($elements as $element) {
-				$key = null;
-				if(!$element->hasAttribute('name')) {
-					$result[$key = $offset++] = null;
-				} else {
-					$key = $element->getAttribute('name');
-				}
+            /** @var XmlConfigDomElement $element */
+            foreach($elements as $element) {
+                $key = null;
+                if(!$element->hasAttribute('name')) {
+                    $result[$key = $offset++] = null;
+                } else {
+                    $key = $element->getAttribute('name');
+                }
 				
-				if($element->hasAgaviParameters()) {
-					$result[$key] = isset($result[$key]) && is_array($result[$key]) ? $result[$key] : array();
-					$result[$key] = $element->getAgaviParameters($result[$key]);
-				} else {
-					$result[$key] = $element->getLiteralValue();
-				}
-			}
-		}
+                if($element->hasAgaviParameters()) {
+                    $result[$key] = isset($result[$key]) && is_array($result[$key]) ? $result[$key] : array();
+                    $result[$key] = $element->getAgaviParameters($result[$key]);
+                } else {
+                    $result[$key] = $element->getLiteralValue();
+                }
+            }
+        }
 		
-		return $result;
-	}
+        return $result;
+    }
 }
 
 ?>
\ No newline at end of file

src/config/ValidatorConfigHandler.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
 	/**
 	 * Execute this configuration handler.
 	 *
-	 * @param      string $document An absolute filesystem path to a configuration file.
+	 * @param      XmlConfigDomDocument $document An absolute filesystem path to a configuration file.
 	 *
 	 * @return     string Data to be written to a cache file.
 	 *
@@ -232,7 +232,7 @@ 
 	 * @param      string               $name The name of the parent container.
 	 * @param      string               $defaultSeverity The severity of the parent container.
 	 * @param      string               $defaultMethod The method of the parent container.
-	 * @param      bool                 $defaultRequiredWhether parent container is required.
+	 * @param      bool                 $defaultRequired parent container is required.
 	 * @param      string               $defaultTranslationDomain The default translation domain of the parent container.
 	 *
 	 * @return     array PHP code blocks that register the validators

Spacing +25 added lines, -25 removed lines

@@ -69,16 +69,16 @@ 
 		
 		$config = $document->documentURI;
 		
-		$code = array();//array('lines' => array(), 'order' => array());
+		$code = array(); //array('lines' => array(), 'order' => array());
 		
-		foreach($document->getConfigurationElements() as $cfg) {
-			if($cfg->has('validator_definitions')) {
-				foreach($cfg->get('validator_definitions') as $def) {
+		foreach ($document->getConfigurationElements() as $cfg) {
+			if ($cfg->has('validator_definitions')) {
+				foreach ($cfg->get('validator_definitions') as $def) {
 					$name = $def->getAttribute('name');
-					if(!isset($this->classMap[$name])) {
+					if (!isset($this->classMap[$name])) {
 						$this->classMap[$name] = array('class' => $def->getAttribute('class'), 'parameters' => array(), 'errors' => array());
 					}
-					$this->classMap[$name]['class'] = $def->getAttribute('class',$this->classMap[$name]['class']);
+					$this->classMap[$name]['class'] = $def->getAttribute('class', $this->classMap[$name]['class']);
 					$this->classMap[$name]['parameters'] = $def->getAgaviParameters($this->classMap[$name]['parameters']);
 					$this->classMap[$name]['errors'] = $this->getAgaviErrors($def, $this->classMap[$name]['errors']);
 				}
@@ -88,14 +88,14 @@ 
 		}
 
 		$newCode = array();
-		if(isset($code[''])) {
+		if (isset($code[''])) {
 			$newCode = $code[''];
 			unset($code['']);
 		}
 
-		foreach($code as $method => $codes) {
+		foreach ($code as $method => $codes) {
 			$newCode[] = 'if($method == ' . var_export($method, true) . ') {';
-			foreach($codes as $line) {
+			foreach ($codes as $line) {
 				$newCode[] = $line;
 			}
 			$newCode[] = '}';
@@ -126,9 +126,9 @@ 
 	 */
 	protected function getValidatorArray($validator, $code, $parent, $stdSeverity, $stdMethod, $stdRequired = true, $stdTranslationDomain = null)
 	{
-		if(!isset($this->classMap[$validator->getAttribute('class')])) {
+		if (!isset($this->classMap[$validator->getAttribute('class')])) {
 			$class = $validator->getAttribute('class');
-			if(!class_exists($class)) {
+			if (!class_exists($class)) {
 				throw new ValidatorException('unknown validator found: ' . $class);
 			}
 			$this->classMap[$class] = array('class' => $class, 'parameters' => array(), 'errors' => array());
@@ -146,7 +146,7 @@ 
 		
 		$stdMethod = $validator->getAttribute('method', $stdMethod);
 		$stdSeverity = $parameters['severity'];
-		if($validator->hasAttribute('name')) {
+		if ($validator->hasAttribute('name')) {
 			$name = $validator->getAttribute('name');
 		} else {
 			$name = Toolkit::uniqid();
@@ -156,25 +156,25 @@ 
 		$parameters = array_merge($this->classMap[$validator->getAttribute('class')]['parameters'], $parameters);
 		$parameters = array_merge($parameters, $validator->getAttributes());
 		$parameters = $validator->getAgaviParameters($parameters);
-		if(!array_key_exists('translation_domain', $parameters) && $stdTranslationDomain !== null) {
+		if (!array_key_exists('translation_domain', $parameters) && $stdTranslationDomain !== null) {
 			$parameters['translation_domain'] = $stdTranslationDomain;
-		} elseif(isset($parameters['translation_domain']) && $parameters['translation_domain'] === '') {
+		} elseif (isset($parameters['translation_domain']) && $parameters['translation_domain'] === '') {
 			// empty translation domains are forbidden, treat as if translation_domain was not set
 			unset($parameters['translation_domain']);
 		}
 		
-		foreach($validator->get('arguments') as $argument) {
-			if($argument->hasAttribute('name')) {
+		foreach ($validator->get('arguments') as $argument) {
+			if ($argument->hasAttribute('name')) {
 				$arguments[$argument->getAttribute('name')] = $argument->getValue();
 			} else {
 				$arguments[] = $argument->getValue();
 			}
 		}
 		
-		if($validator->hasChild('arguments')) {
+		if ($validator->hasChild('arguments')) {
 			$parameters['base'] = $validator->getChild('arguments')->getAttribute('base');
 			
-			if(!$arguments) {
+			if (!$arguments) {
 				// no arguments defined, but there is an <arguments /> element, so we're validating an array there
 				// lets add an empty fake argument for validation to work
 				// must be an empty string, not null
@@ -184,16 +184,16 @@ 
 		
 		$errors = $this->getAgaviErrors($validator, $this->classMap[$validator->getAttribute('class')]['errors']);
 		
-		if($validator->hasAttribute('required')) {
+		if ($validator->hasAttribute('required')) {
 			$stdRequired = $parameters['required'] = Toolkit::literalize($validator->getAttribute('required'));
 		}
 		
 		$methods = array('');
-		if(trim($stdMethod)) {
+		if (trim($stdMethod)) {
 			$methods = preg_split('/[\s]+/', $stdMethod);
 		}
 		
-		foreach($methods as $method) {
+		foreach ($methods as $method) {
 			$code[$method][$name] = implode("\n", array(
 				sprintf(
 					'${%s} = new %s();',
@@ -247,9 +247,9 @@ 
 	{
 		// the problem here is that the <validators> parent is not just optional, but can also occur more than once
 		/** @var XmlConfigDomElement $validator */
-		foreach($node->get('validators') as $validator) {
+		foreach ($node->get('validators') as $validator) {
 			// let's see if this buddy has a <validators> parent with valuable information
-			if($validator->parentNode->localName == 'validators') {
+			if ($validator->parentNode->localName == 'validators') {
 				$severity = $validator->parentNode->getAttribute('severity', $defaultSeverity);
 				$method = $validator->parentNode->getAttribute('method', $defaultMethod);
 				$translationDomain = $validator->parentNode->getAttribute('translation_domain', $defaultTranslationDomain);
@@ -287,9 +287,9 @@ 
 		
 		$elements = $node->get('errors', self::XML_NAMESPACE);
 		
-		foreach($elements as $element) {
+		foreach ($elements as $element) {
 			$key = '';
-			if($element->hasAttribute('for')) {
+			if ($element->hasAttribute('for')) {
 				$key = $element->getAttribute('for');
 			}
 			

Indentation +228 added lines, -228 removed lines

@@ -39,265 +39,265 @@
  */
 class ValidatorConfigHandler extends XmlConfigHandler
 {
-	const XML_NAMESPACE = 'http://agavi.org/agavi/config/parts/validators/1.1';
+    const XML_NAMESPACE = 'http://agavi.org/agavi/config/parts/validators/1.1';
 	
-	/**
-	 * @var        array operator => validator mapping
-	 */
-	protected $classMap = array();
+    /**
+     * @var        array operator => validator mapping
+     */
+    protected $classMap = array();
 
-	/**
-	 * Execute this configuration handler.
-	 *
-	 * @param      string $document An absolute filesystem path to a configuration file.
-	 *
-	 * @return     string Data to be written to a cache file.
-	 *
-	 * @throws     <b>UnreadableException</b> If a requested configuration
-	 *                                             file does not exist or is not
-	 *                                             readable.
-	 * @throws     <b>ParseException</b> If a requested configuration file is
-	 *                                        improperly formatted.
-	 *
-	 * @author     Uwe Mesecke <uwe@mesecke.net>
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function execute(XmlConfigDomDocument $document)
-	{
-		$document->setDefaultNamespace(self::XML_NAMESPACE, 'validators');
+    /**
+     * Execute this configuration handler.
+     *
+     * @param      string $document An absolute filesystem path to a configuration file.
+     *
+     * @return     string Data to be written to a cache file.
+     *
+     * @throws     <b>UnreadableException</b> If a requested configuration
+     *                                             file does not exist or is not
+     *                                             readable.
+     * @throws     <b>ParseException</b> If a requested configuration file is
+     *                                        improperly formatted.
+     *
+     * @author     Uwe Mesecke <uwe@mesecke.net>
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function execute(XmlConfigDomDocument $document)
+    {
+        $document->setDefaultNamespace(self::XML_NAMESPACE, 'validators');
 		
-		$config = $document->documentURI;
+        $config = $document->documentURI;
 		
-		$code = array();//array('lines' => array(), 'order' => array());
+        $code = array();//array('lines' => array(), 'order' => array());
 		
-		foreach($document->getConfigurationElements() as $cfg) {
-			if($cfg->has('validator_definitions')) {
-				foreach($cfg->get('validator_definitions') as $def) {
-					$name = $def->getAttribute('name');
-					if(!isset($this->classMap[$name])) {
-						$this->classMap[$name] = array('class' => $def->getAttribute('class'), 'parameters' => array(), 'errors' => array());
-					}
-					$this->classMap[$name]['class'] = $def->getAttribute('class',$this->classMap[$name]['class']);
-					$this->classMap[$name]['parameters'] = $def->getAgaviParameters($this->classMap[$name]['parameters']);
-					$this->classMap[$name]['errors'] = $this->getAgaviErrors($def, $this->classMap[$name]['errors']);
-				}
-			}
+        foreach($document->getConfigurationElements() as $cfg) {
+            if($cfg->has('validator_definitions')) {
+                foreach($cfg->get('validator_definitions') as $def) {
+                    $name = $def->getAttribute('name');
+                    if(!isset($this->classMap[$name])) {
+                        $this->classMap[$name] = array('class' => $def->getAttribute('class'), 'parameters' => array(), 'errors' => array());
+                    }
+                    $this->classMap[$name]['class'] = $def->getAttribute('class',$this->classMap[$name]['class']);
+                    $this->classMap[$name]['parameters'] = $def->getAgaviParameters($this->classMap[$name]['parameters']);
+                    $this->classMap[$name]['errors'] = $this->getAgaviErrors($def, $this->classMap[$name]['errors']);
+                }
+            }
 			
-			$code = $this->processValidatorElements($cfg, $code, 'validationManager');
-		}
+            $code = $this->processValidatorElements($cfg, $code, 'validationManager');
+        }
 
-		$newCode = array();
-		if(isset($code[''])) {
-			$newCode = $code[''];
-			unset($code['']);
-		}
+        $newCode = array();
+        if(isset($code[''])) {
+            $newCode = $code[''];
+            unset($code['']);
+        }
 
-		foreach($code as $method => $codes) {
-			$newCode[] = 'if($method == ' . var_export($method, true) . ') {';
-			foreach($codes as $line) {
-				$newCode[] = $line;
-			}
-			$newCode[] = '}';
-		}
+        foreach($code as $method => $codes) {
+            $newCode[] = 'if($method == ' . var_export($method, true) . ') {';
+            foreach($codes as $line) {
+                $newCode[] = $line;
+            }
+            $newCode[] = '}';
+        }
 
-		return $this->generate($newCode, $config);
-	}
+        return $this->generate($newCode, $config);
+    }
 
-	/**
-	 * Builds an array of php code strings, each of them creating a validator
-	 *
-	 * @param      XmlConfigDomElement $validator The value holder of this validator.
-	 * @param      array               $code The code of old validators (we simply
-	 *                                       overwrite "old" validators here).
-	 * @param      string              $parent The name of the parent container.
-	 * @param      string              $stdSeverity The severity of the parent container.
-	 * @param      string              $stdMethod The method of the parent container.
-	 * @param      bool                $stdRequired Whether parent container is required.
-	 * @param      string              $stdTranslationDomain The default translation domain of the parent container.
-	 *
-	 * @return     array PHP code blocks that register the validators
-	 *
-	 * @author     Uwe Mesecke <uwe@mesecke.net>
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @author     Steffen Gransow <agavi@mivesto.de>
-	 * @since      0.11.0
-	 */
-	protected function getValidatorArray($validator, $code, $parent, $stdSeverity, $stdMethod, $stdRequired = true, $stdTranslationDomain = null)
-	{
-		if(!isset($this->classMap[$validator->getAttribute('class')])) {
-			$class = $validator->getAttribute('class');
-			if(!class_exists($class)) {
-				throw new ValidatorException('unknown validator found: ' . $class);
-			}
-			$this->classMap[$class] = array('class' => $class, 'parameters' => array(), 'errors' => array());
-		} else {
-			$class = $this->classMap[$validator->getAttribute('class')]['class'];
-		}
+    /**
+     * Builds an array of php code strings, each of them creating a validator
+     *
+     * @param      XmlConfigDomElement $validator The value holder of this validator.
+     * @param      array               $code The code of old validators (we simply
+     *                                       overwrite "old" validators here).
+     * @param      string              $parent The name of the parent container.
+     * @param      string              $stdSeverity The severity of the parent container.
+     * @param      string              $stdMethod The method of the parent container.
+     * @param      bool                $stdRequired Whether parent container is required.
+     * @param      string              $stdTranslationDomain The default translation domain of the parent container.
+     *
+     * @return     array PHP code blocks that register the validators
+     *
+     * @author     Uwe Mesecke <uwe@mesecke.net>
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @author     Steffen Gransow <agavi@mivesto.de>
+     * @since      0.11.0
+     */
+    protected function getValidatorArray($validator, $code, $parent, $stdSeverity, $stdMethod, $stdRequired = true, $stdTranslationDomain = null)
+    {
+        if(!isset($this->classMap[$validator->getAttribute('class')])) {
+            $class = $validator->getAttribute('class');
+            if(!class_exists($class)) {
+                throw new ValidatorException('unknown validator found: ' . $class);
+            }
+            $this->classMap[$class] = array('class' => $class, 'parameters' => array(), 'errors' => array());
+        } else {
+            $class = $this->classMap[$validator->getAttribute('class')]['class'];
+        }
 		
-		// setting up parameters
-		$parameters = array(
-			'severity' => $validator->getAttribute('severity', $stdSeverity),
-			'required' => $stdRequired,
-		);
+        // setting up parameters
+        $parameters = array(
+            'severity' => $validator->getAttribute('severity', $stdSeverity),
+            'required' => $stdRequired,
+        );
 		
-		$arguments = array();
+        $arguments = array();
 		
-		$stdMethod = $validator->getAttribute('method', $stdMethod);
-		$stdSeverity = $parameters['severity'];
-		if($validator->hasAttribute('name')) {
-			$name = $validator->getAttribute('name');
-		} else {
-			$name = Toolkit::uniqid();
-			$validator->setAttribute('name', $name);
-		}
+        $stdMethod = $validator->getAttribute('method', $stdMethod);
+        $stdSeverity = $parameters['severity'];
+        if($validator->hasAttribute('name')) {
+            $name = $validator->getAttribute('name');
+        } else {
+            $name = Toolkit::uniqid();
+            $validator->setAttribute('name', $name);
+        }
 		
-		$parameters = array_merge($this->classMap[$validator->getAttribute('class')]['parameters'], $parameters);
-		$parameters = array_merge($parameters, $validator->getAttributes());
-		$parameters = $validator->getAgaviParameters($parameters);
-		if(!array_key_exists('translation_domain', $parameters) && $stdTranslationDomain !== null) {
-			$parameters['translation_domain'] = $stdTranslationDomain;
-		} elseif(isset($parameters['translation_domain']) && $parameters['translation_domain'] === '') {
-			// empty translation domains are forbidden, treat as if translation_domain was not set
-			unset($parameters['translation_domain']);
-		}
+        $parameters = array_merge($this->classMap[$validator->getAttribute('class')]['parameters'], $parameters);
+        $parameters = array_merge($parameters, $validator->getAttributes());
+        $parameters = $validator->getAgaviParameters($parameters);
+        if(!array_key_exists('translation_domain', $parameters) && $stdTranslationDomain !== null) {
+            $parameters['translation_domain'] = $stdTranslationDomain;
+        } elseif(isset($parameters['translation_domain']) && $parameters['translation_domain'] === '') {
+            // empty translation domains are forbidden, treat as if translation_domain was not set
+            unset($parameters['translation_domain']);
+        }
 		
-		foreach($validator->get('arguments') as $argument) {
-			if($argument->hasAttribute('name')) {
-				$arguments[$argument->getAttribute('name')] = $argument->getValue();
-			} else {
-				$arguments[] = $argument->getValue();
-			}
-		}
+        foreach($validator->get('arguments') as $argument) {
+            if($argument->hasAttribute('name')) {
+                $arguments[$argument->getAttribute('name')] = $argument->getValue();
+            } else {
+                $arguments[] = $argument->getValue();
+            }
+        }
 		
-		if($validator->hasChild('arguments')) {
-			$parameters['base'] = $validator->getChild('arguments')->getAttribute('base');
+        if($validator->hasChild('arguments')) {
+            $parameters['base'] = $validator->getChild('arguments')->getAttribute('base');
 			
-			if(!$arguments) {
-				// no arguments defined, but there is an <arguments /> element, so we're validating an array there
-				// lets add an empty fake argument for validation to work
-				// must be an empty string, not null
-				$arguments[] = '';
-			}
-		}
+            if(!$arguments) {
+                // no arguments defined, but there is an <arguments /> element, so we're validating an array there
+                // lets add an empty fake argument for validation to work
+                // must be an empty string, not null
+                $arguments[] = '';
+            }
+        }
 		
-		$errors = $this->getAgaviErrors($validator, $this->classMap[$validator->getAttribute('class')]['errors']);
+        $errors = $this->getAgaviErrors($validator, $this->classMap[$validator->getAttribute('class')]['errors']);
 		
-		if($validator->hasAttribute('required')) {
-			$stdRequired = $parameters['required'] = Toolkit::literalize($validator->getAttribute('required'));
-		}
+        if($validator->hasAttribute('required')) {
+            $stdRequired = $parameters['required'] = Toolkit::literalize($validator->getAttribute('required'));
+        }
 		
-		$methods = array('');
-		if(trim($stdMethod)) {
-			$methods = preg_split('/[\s]+/', $stdMethod);
-		}
+        $methods = array('');
+        if(trim($stdMethod)) {
+            $methods = preg_split('/[\s]+/', $stdMethod);
+        }
 		
-		foreach($methods as $method) {
-			$code[$method][$name] = implode("\n", array(
-				sprintf(
-					'${%s} = new %s();',
-					var_export('_validator_' . $name, true),
-					$class
-				),
-				sprintf(
-					'${%s}->initialize($this->getContext(), %s, %s, %s);',
-					var_export('_validator_' . $name, true),
-					var_export($parameters, true),
-					var_export($arguments, true),
-					var_export($errors, true)
-				),
-				sprintf(
-					'${%s}->addChild(${%s});',
-					var_export($parent, true),
-					var_export('_validator_' . $name, true)
-				),
-			));
-		}
+        foreach($methods as $method) {
+            $code[$method][$name] = implode("\n", array(
+                sprintf(
+                    '${%s} = new %s();',
+                    var_export('_validator_' . $name, true),
+                    $class
+                ),
+                sprintf(
+                    '${%s}->initialize($this->getContext(), %s, %s, %s);',
+                    var_export('_validator_' . $name, true),
+                    var_export($parameters, true),
+                    var_export($arguments, true),
+                    var_export($errors, true)
+                ),
+                sprintf(
+                    '${%s}->addChild(${%s});',
+                    var_export($parent, true),
+                    var_export('_validator_' . $name, true)
+                ),
+            ));
+        }
 		
-		// more <validator> or <validators> children
-		$code = $this->processValidatorElements($validator, $code, '_validator_' . $name, $stdSeverity, $stdMethod, $stdRequired, isset($parameters['translation_domain']) ? $parameters['translation_domain'] : null);
+        // more <validator> or <validators> children
+        $code = $this->processValidatorElements($validator, $code, '_validator_' . $name, $stdSeverity, $stdMethod, $stdRequired, isset($parameters['translation_domain']) ? $parameters['translation_domain'] : null);
 		
-		return $code;
-	}
+        return $code;
+    }
 	
-	/**
-	 * Grabs generated code from the given element.
-	 *
-	 * @see        ValidatorConfigHandler::getValidatorArray()
-	 *
-	 * @param      XmlConfigDomElement $node The value holder of this validator.
-	 * @param      array                $code The code of old validators (we simply
-	 *                                        overwrite "old" validators here).
-	 * @param      string               $name The name of the parent container.
-	 * @param      string               $defaultSeverity The severity of the parent container.
-	 * @param      string               $defaultMethod The method of the parent container.
-	 * @param      bool                 $defaultRequiredWhether parent container is required.
-	 * @param      string               $defaultTranslationDomain The default translation domain of the parent container.
-	 *
-	 * @return     array PHP code blocks that register the validators
-	 *
-	 * @author     Uwe Mesecke <uwe@mesecke.net>
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @author     Steffen Gransow <agavi@mivesto.de>
-	 * @since      0.11.0
-	 */
-	protected function processValidatorElements(XmlConfigDomElement $node, $code, $name, $defaultSeverity = 'error', $defaultMethod = null, $defaultRequired = true, $defaultTranslationDomain = null)
-	{
-		// the problem here is that the <validators> parent is not just optional, but can also occur more than once
-		/** @var XmlConfigDomElement $validator */
-		foreach($node->get('validators') as $validator) {
-			// let's see if this buddy has a <validators> parent with valuable information
-			if($validator->parentNode->localName == 'validators') {
-				$severity = $validator->parentNode->getAttribute('severity', $defaultSeverity);
-				$method = $validator->parentNode->getAttribute('method', $defaultMethod);
-				$translationDomain = $validator->parentNode->getAttribute('translation_domain', $defaultTranslationDomain);
-			} else {
-				$severity = $defaultSeverity;
-				$method = $defaultMethod;
-				$translationDomain = $defaultTranslationDomain;
-			}
-			$required = $defaultRequired;
+    /**
+     * Grabs generated code from the given element.
+     *
+     * @see        ValidatorConfigHandler::getValidatorArray()
+     *
+     * @param      XmlConfigDomElement $node The value holder of this validator.
+     * @param      array                $code The code of old validators (we simply
+     *                                        overwrite "old" validators here).
+     * @param      string               $name The name of the parent container.
+     * @param      string               $defaultSeverity The severity of the parent container.
+     * @param      string               $defaultMethod The method of the parent container.
+     * @param      bool                 $defaultRequiredWhether parent container is required.
+     * @param      string               $defaultTranslationDomain The default translation domain of the parent container.
+     *
+     * @return     array PHP code blocks that register the validators
+     *
+     * @author     Uwe Mesecke <uwe@mesecke.net>
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @author     Steffen Gransow <agavi@mivesto.de>
+     * @since      0.11.0
+     */
+    protected function processValidatorElements(XmlConfigDomElement $node, $code, $name, $defaultSeverity = 'error', $defaultMethod = null, $defaultRequired = true, $defaultTranslationDomain = null)
+    {
+        // the problem here is that the <validators> parent is not just optional, but can also occur more than once
+        /** @var XmlConfigDomElement $validator */
+        foreach($node->get('validators') as $validator) {
+            // let's see if this buddy has a <validators> parent with valuable information
+            if($validator->parentNode->localName == 'validators') {
+                $severity = $validator->parentNode->getAttribute('severity', $defaultSeverity);
+                $method = $validator->parentNode->getAttribute('method', $defaultMethod);
+                $translationDomain = $validator->parentNode->getAttribute('translation_domain', $defaultTranslationDomain);
+            } else {
+                $severity = $defaultSeverity;
+                $method = $defaultMethod;
+                $translationDomain = $defaultTranslationDomain;
+            }
+            $required = $defaultRequired;
 			
-			// append the code to generate
-			$code = $this->getValidatorArray($validator, $code, $name, $severity, $method, $required, $translationDomain);
-		}
+            // append the code to generate
+            $code = $this->getValidatorArray($validator, $code, $name, $severity, $method, $required, $translationDomain);
+        }
 		
-		return $code;
-	}
+        return $code;
+    }
 	
-	/**
-	 * Retrieve all of the Agavi error elements associated with this
-	 * element.
-	 *
-	 * @param      XmlConfigDomElement $node The value holder of this validator.
-	 * @param      array               $existing An array of existing errors.
-	 *
-	 * @return     array The complete array of errors.
-	 *
-	 * @author     Jan Schütze <JanS@DracoBlue.de>
-	 * @author     Steffen Gransow <agavi@mivesto.de>
-	 *
-	 * @since      1.0.8
-	 */
-	public function getAgaviErrors(XmlConfigDomElement $node, array $existing = array())
-	{
-		$result = $existing;
+    /**
+     * Retrieve all of the Agavi error elements associated with this
+     * element.
+     *
+     * @param      XmlConfigDomElement $node The value holder of this validator.
+     * @param      array               $existing An array of existing errors.
+     *
+     * @return     array The complete array of errors.
+     *
+     * @author     Jan Schütze <JanS@DracoBlue.de>
+     * @author     Steffen Gransow <agavi@mivesto.de>
+     *
+     * @since      1.0.8
+     */
+    public function getAgaviErrors(XmlConfigDomElement $node, array $existing = array())
+    {
+        $result = $existing;
 		
-		$elements = $node->get('errors', self::XML_NAMESPACE);
+        $elements = $node->get('errors', self::XML_NAMESPACE);
 		
-		foreach($elements as $element) {
-			$key = '';
-			if($element->hasAttribute('for')) {
-				$key = $element->getAttribute('for');
-			}
+        foreach($elements as $element) {
+            $key = '';
+            if($element->hasAttribute('for')) {
+                $key = $element->getAttribute('for');
+            }
 			
-			$result[$key] = $element->getValue();
-		}
+            $result[$key] = $element->getValue();
+        }
 		
-		return $result;
-	}
+        return $result;
+    }
 }
 
 ?>

src/core/Context.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -363,7 +363,7 @@
 	 * Retrieve a Model implementation instance.
 	 *
 	 * @param      string $modelName A model name.
-	 * @param      string $moduleNameA module name, if the requested model is a module model,
+	 * @param      string $moduleName module name, if the requested model is a module model,
 	 *                    or null for global models.
 	 * @param      array  $parameters An array of parameters to be passed to initialize() or
 	 *                    the constructor.

Spacing +21 added lines, -21 removed lines

@@ -182,7 +182,7 @@ 
 	 */
 	public function getFactoryInfo($for)
 	{
-		if(isset($this->factories[$for])) {
+		if (isset($this->factories[$for])) {
 			return $this->factories[$for];
 		}
 	}
@@ -216,7 +216,7 @@ 
 	public function createInstanceFor($for)
 	{
 		$info = $this->getFactoryInfo($for);
-		if(null === $info) {
+		if (null === $info) {
 			throw new AgaviException(sprintf('No factory info for "%s"', $for));
 		}
 		
@@ -258,7 +258,7 @@ 
 	 */
 	public function getDatabaseConnection($name = null)
 	{
-		if($this->databaseManager !== null) {
+		if ($this->databaseManager !== null) {
 			return $this->databaseManager->getDatabase($name)->getConnection();
 		}
 	}
@@ -295,20 +295,20 @@ 
 	public static function getInstance($profile = null)
 	{
 		try {
-			if($profile === null) {
+			if ($profile === null) {
 				$profile = Config::get('core.default_context');
-				if($profile === null) {
+				if ($profile === null) {
 					throw new AgaviException('You must supply a context name to Context::getInstance() or set the name of the default context to be used in the configuration directive "core.default_context".');
 				}
 			}
 			$profile = strtolower($profile);
-			if(!isset(self::$instances[$profile])) {
+			if (!isset(self::$instances[$profile])) {
 				$class = Config::get('core.context_implementation', get_called_class());
 				self::$instances[$profile] = new $class($profile);
 				self::$instances[$profile]->initialize();
 			}
 			return self::$instances[$profile];
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			AgaviException::render($e);
 		}
 	}
@@ -339,7 +339,7 @@ 
 	{
 		try {
 			include(ConfigCache::checkConfig(Config::get('core.config_dir') . '/factories.xml', $this->name));
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			AgaviException::render($e, $this);
 		}
 		
@@ -354,7 +354,7 @@ 
 	 */
 	public function shutdown()
 	{
-		foreach($this->shutdownSequence as $object) {
+		foreach ($this->shutdownSequence as $object) {
 			$object->shutdown();
 		}
 	}
@@ -384,17 +384,17 @@ 
 		$file = null;
 		$rc = null;
 		
-		if($moduleName === null) {
+		if ($moduleName === null) {
 			// global model
 			// let's try to autoload that baby
-			if(!class_exists($class)) {
+			if (!class_exists($class)) {
 				// it's not there. the hunt is on
 				$file = Config::get('core.model_dir') . '/' . $modelName . 'Model.class.php';
 			}
 		} else {
 			try {
 				$this->controller->initializeModule($moduleName);
-			} catch(DisabledModuleException $e) {
+			} catch (DisabledModuleException $e) {
 				// swallow, this will load the modules autoload but throw an exception 
 				// if the module is disabled.
 			}
@@ -402,17 +402,17 @@ 
 			// alternative name
 			$class = $moduleName . '_' . $class;
 			// let's try to autoload the baby
-			if(!class_exists($class)) {
+			if (!class_exists($class)) {
 				// it's not there. the hunt is on
 				$file = Config::get('core.module_dir') . '/' . $moduleName . '/models/' . $modelName . 'Model.class.php';
 			}
 		}
 
-		if(null !== $file && is_readable($file)) {
+		if (null !== $file && is_readable($file)) {
 			require($file);
 		}
 
-		if(!class_exists($class)) {
+		if (!class_exists($class)) {
 			// it's not there. 
 			throw new AgaviException(sprintf("Couldn't find class for Model %s", $origModelName));
 		}
@@ -421,12 +421,12 @@ 
 		
 		$rc = new \ReflectionClass($class);
 		
-		if($rc->implementsInterface('Agavi\\Model\\SingletonModelInterface')) {
+		if ($rc->implementsInterface('Agavi\\Model\\SingletonModelInterface')) {
 			// it's a singleton
-			if(!isset($this->singletonModelInstances[$class])) {
+			if (!isset($this->singletonModelInstances[$class])) {
 				// no instance yet, so we create one
 				
-				if($parameters === null || $rc->getConstructor() === null) {
+				if ($parameters === null || $rc->getConstructor() === null) {
 					// it has an initialize() method, or no parameters were given, so we don't hand arguments to the constructor
 					$this->singletonModelInstances[$class] = new $class();
 				} else {
@@ -437,7 +437,7 @@ 
 			$model = $this->singletonModelInstances[$class];
 		} else {
 			// create an instance
-			if($parameters === null || $rc->getConstructor() === null) {
+			if ($parameters === null || $rc->getConstructor() === null) {
 				// it has an initialize() method, or no parameters were given, so we don't hand arguments to the constructor
 				$model = new $class();
 			} else {
@@ -446,9 +446,9 @@ 
 			}
 		}
 		
-		if(is_callable(array($model, 'initialize'))) {
+		if (is_callable(array($model, 'initialize'))) {
 			// pass the constructor params again. dual use for the win
-			$model->initialize($this, (array) $parameters);
+			$model->initialize($this, (array)$parameters);
 		}
 		
 		return $model;

Indentation +433 added lines, -433 removed lines

@@ -56,482 +56,482 @@
 
 class Context
 {
-	/**
-	 * @var        string The name of the Context.
-	 */
-	protected $name = '';
+    /**
+     * @var        string The name of the Context.
+     */
+    protected $name = '';
 	
-	/**
-	 * @var        Dispatcher A Dispatcher instance.
-	 */
-	protected $dispatcher = null;
+    /**
+     * @var        Dispatcher A Dispatcher instance.
+     */
+    protected $dispatcher = null;
 	
-	/**
-	 * @var        array An array of class names for frequently used factories.
-	 */
-	protected $factories = array(
-		'dispatch_filter' => null,
-		'execution_container' => null,
-		'execution_filter' => null,
-		'filter_chain' => null,
-		'response' => null,
-		'security_filter' => null,
-		'validation_manager' => null,
-	);
+    /**
+     * @var        array An array of class names for frequently used factories.
+     */
+    protected $factories = array(
+        'dispatch_filter' => null,
+        'execution_container' => null,
+        'execution_filter' => null,
+        'filter_chain' => null,
+        'response' => null,
+        'security_filter' => null,
+        'validation_manager' => null,
+    );
 	
-	/**
-	 * @var        DatabaseManager A DatabaseManager instance.
-	 */
-	protected $databaseManager = null;
+    /**
+     * @var        DatabaseManager A DatabaseManager instance.
+     */
+    protected $databaseManager = null;
 	
-	/**
-	 * @var        LoggerManager A LoggerManager instance.
-	 */
-	protected $loggerManager = null;
+    /**
+     * @var        LoggerManager A LoggerManager instance.
+     */
+    protected $loggerManager = null;
 	
-	/**
-	 * @var        Request A Request instance.
-	 */
-	protected $request = null;
+    /**
+     * @var        Request A Request instance.
+     */
+    protected $request = null;
 	
-	/**
-	 * @var        Routing A Routing instance.
-	 */
-	protected $routing = null;
+    /**
+     * @var        Routing A Routing instance.
+     */
+    protected $routing = null;
 	
-	/**
-	 * @var        Storage A Storage instance.
-	 */
-	protected $storage = null;
+    /**
+     * @var        Storage A Storage instance.
+     */
+    protected $storage = null;
 	
-	/**
-	 * @var        TranslationManager A TranslationManager instance.
-	 */
-	protected $translationManager = null;
+    /**
+     * @var        TranslationManager A TranslationManager instance.
+     */
+    protected $translationManager = null;
 	
-	/**
-	 * @var        User A User instance.
-	 */
-	protected $user = null;
+    /**
+     * @var        User A User instance.
+     */
+    protected $user = null;
 	
-	/**
-	 * @var        array The array used for the shutdown sequence.
-	 */
-	protected $shutdownSequence = array();
+    /**
+     * @var        array The array used for the shutdown sequence.
+     */
+    protected $shutdownSequence = array();
 	
-	/**
-	 * @var        array An array of Context instances.
-	 */
-	protected static $instances = array();
+    /**
+     * @var        array An array of Context instances.
+     */
+    protected static $instances = array();
 	
-	/**
-	 * @var        array An array of SingletonModel instances.
-	 */
-	protected $singletonModelInstances = array();
+    /**
+     * @var        array An array of SingletonModel instances.
+     */
+    protected $singletonModelInstances = array();
 
-	/**
-	 * Clone method, overridden to prevent cloning, there can be only one.
-	 *
-	 * @author     Mike Vincent <mike@agavi.org>
-	 * @since      0.9.0
-	 */
-	public function __clone()
-	{
-		trigger_error('Cloning a Context instance is not allowed.', E_USER_ERROR);
-	}
+    /**
+     * Clone method, overridden to prevent cloning, there can be only one.
+     *
+     * @author     Mike Vincent <mike@agavi.org>
+     * @since      0.9.0
+     */
+    public function __clone()
+    {
+        trigger_error('Cloning a Context instance is not allowed.', E_USER_ERROR);
+    }
 
-	/**
-	 * Constructor method, intentionally made protected so the context cannot be
-	 * created directly.
-	 *
-	 * @param      string $name The name of this context.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @author     Mike Vincent <mike@agavi.org>
-	 * @since      0.9.0
-	 */
-	protected function __construct($name)
-	{
-		$this->name = $name;
-	}
+    /**
+     * Constructor method, intentionally made protected so the context cannot be
+     * created directly.
+     *
+     * @param      string $name The name of this context.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @author     Mike Vincent <mike@agavi.org>
+     * @since      0.9.0
+     */
+    protected function __construct($name)
+    {
+        $this->name = $name;
+    }
 
-	/**
-	 * __toString overload, returns the name of the Context.
-	 *
-	 * @return     string The context name.
-	 *
-	 * @see        Context::getName()
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function __toString()
-	{
-		return $this->getName();
-	}
+    /**
+     * __toString overload, returns the name of the Context.
+     *
+     * @return     string The context name.
+     *
+     * @see        Context::getName()
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function __toString()
+    {
+        return $this->getName();
+    }
 	
-	/**
-	 * Get information on a frequently used class.
-	 *
-	 * @param      string $for The factory identifier.
-	 *
-	 * @return     array An associative array (keys 'class' and 'parameters').
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getFactoryInfo($for)
-	{
-		if(isset($this->factories[$for])) {
-			return $this->factories[$for];
-		}
-	}
+    /**
+     * Get information on a frequently used class.
+     *
+     * @param      string $for The factory identifier.
+     *
+     * @return     array An associative array (keys 'class' and 'parameters').
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getFactoryInfo($for)
+    {
+        if(isset($this->factories[$for])) {
+            return $this->factories[$for];
+        }
+    }
 	
-	/**
-	 * Set information on a frequently used class.
-	 *
-	 * @param      string $for The factory identifier.
-	 * @param      array $info An associative array (keys 'class' and 'parameters').
-	 *
-	 * @author     Felix Gilcher <felix.gilcher@bitxtender.com>
-	 * @since      1.0.1
-	 */
-	public function setFactoryInfo($for, array $info)
-	{
-		$this->factories[$for] = $info;
-	}
+    /**
+     * Set information on a frequently used class.
+     *
+     * @param      string $for The factory identifier.
+     * @param      array $info An associative array (keys 'class' and 'parameters').
+     *
+     * @author     Felix Gilcher <felix.gilcher@bitxtender.com>
+     * @since      1.0.1
+     */
+    public function setFactoryInfo($for, array $info)
+    {
+        $this->factories[$for] = $info;
+    }
 
-	/**
-	 * Factory for frequently used classes from factories.xml
-	 *
-	 * @param      string $for The factory identifier.
-	 *
-	 * @return     mixed An instance, already initialized with parameters.
-	 *
-	 * @throws     AgaviException If no such identifier exists.
-	 *
-	 * @author     David Zülke <david.zuelke@bitextender.com>
-	 * @since      1.0.0
-	 */
-	public function createInstanceFor($for)
-	{
-		$info = $this->getFactoryInfo($for);
-		if(null === $info) {
-			throw new AgaviException(sprintf('No factory info for "%s"', $for));
-		}
+    /**
+     * Factory for frequently used classes from factories.xml
+     *
+     * @param      string $for The factory identifier.
+     *
+     * @return     mixed An instance, already initialized with parameters.
+     *
+     * @throws     AgaviException If no such identifier exists.
+     *
+     * @author     David Zülke <david.zuelke@bitextender.com>
+     * @since      1.0.0
+     */
+    public function createInstanceFor($for)
+    {
+        $info = $this->getFactoryInfo($for);
+        if(null === $info) {
+            throw new AgaviException(sprintf('No factory info for "%s"', $for));
+        }
 		
-		$class = new $info['class']();
-		$class->initialize($this, $info['parameters']);
-		return $class;
-	}
+        $class = new $info['class']();
+        $class->initialize($this, $info['parameters']);
+        return $class;
+    }
 
-	/**
-	 * Retrieve the Dispatcher.
-	 *
-	 * @return     Dispatcher The current Dispatcher implementation instance.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @since      0.9.0
-	 */
-	public function getDispatcher()
-	{
-		return $this->dispatcher;
-	}
+    /**
+     * Retrieve the Dispatcher.
+     *
+     * @return     Dispatcher The current Dispatcher implementation instance.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @since      0.9.0
+     */
+    public function getDispatcher()
+    {
+        return $this->dispatcher;
+    }
 
-	/**
-	 * Retrieve a database connection from the database manager.
-	 *
-	 * This is a shortcut to manually getting a connection from an existing
-	 * database implementation instance.
-	 *
-	 * If the core.use_database setting is off, this will return null.
-	 *
-	 * @param      string $name A database name.
-	 *
-	 * @return     mixed A database connection.
-	 *
-	 * @throws     DatabaseException If the requested database name
-	 *                                           does not exist.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @since      0.9.0
-	 */
-	public function getDatabaseConnection($name = null)
-	{
-		if($this->databaseManager !== null) {
-			return $this->databaseManager->getDatabase($name)->getConnection();
-		}
-	}
+    /**
+     * Retrieve a database connection from the database manager.
+     *
+     * This is a shortcut to manually getting a connection from an existing
+     * database implementation instance.
+     *
+     * If the core.use_database setting is off, this will return null.
+     *
+     * @param      string $name A database name.
+     *
+     * @return     mixed A database connection.
+     *
+     * @throws     DatabaseException If the requested database name
+     *                                           does not exist.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @since      0.9.0
+     */
+    public function getDatabaseConnection($name = null)
+    {
+        if($this->databaseManager !== null) {
+            return $this->databaseManager->getDatabase($name)->getConnection();
+        }
+    }
 
-	/**
-	 * Retrieve the database manager.
-	 *
-	 * @return     DatabaseManager The current DatabaseManager instance.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @since      0.9.0
-	 */
-	public function getDatabaseManager()
-	{
-		return $this->databaseManager;
-	}
+    /**
+     * Retrieve the database manager.
+     *
+     * @return     DatabaseManager The current DatabaseManager instance.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @since      0.9.0
+     */
+    public function getDatabaseManager()
+    {
+        return $this->databaseManager;
+    }
 
-	/**
-	 * Retrieve the Context instance.
-	 *
-	 * If you don't supply a profile name this will try to return the context 
-	 * specified in the <kbd>core.default_context</kbd> setting.
-	 *
-	 * @param      string $profile A name corresponding to a section of the config
-	 *
-	 * @return     Context An context instance initialized with the
-	 *                     settings of the requested context name
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @author     Mike Vincent <mike@agavi.org>
-	 * @since      0.9.0
-	 */
-	public static function getInstance($profile = null)
-	{
-		try {
-			if($profile === null) {
-				$profile = Config::get('core.default_context');
-				if($profile === null) {
-					throw new AgaviException('You must supply a context name to Context::getInstance() or set the name of the default context to be used in the configuration directive "core.default_context".');
-				}
-			}
-			$profile = strtolower($profile);
-			if(!isset(self::$instances[$profile])) {
-				$class = Config::get('core.context_implementation', get_called_class());
-				self::$instances[$profile] = new $class($profile);
-				self::$instances[$profile]->initialize();
-			}
-			return self::$instances[$profile];
-		} catch(\Exception $e) {
-			AgaviException::render($e);
-		}
-	}
+    /**
+     * Retrieve the Context instance.
+     *
+     * If you don't supply a profile name this will try to return the context 
+     * specified in the <kbd>core.default_context</kbd> setting.
+     *
+     * @param      string $profile A name corresponding to a section of the config
+     *
+     * @return     Context An context instance initialized with the
+     *                     settings of the requested context name
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @author     David Zülke <dz@bitxtender.com>
+     * @author     Mike Vincent <mike@agavi.org>
+     * @since      0.9.0
+     */
+    public static function getInstance($profile = null)
+    {
+        try {
+            if($profile === null) {
+                $profile = Config::get('core.default_context');
+                if($profile === null) {
+                    throw new AgaviException('You must supply a context name to Context::getInstance() or set the name of the default context to be used in the configuration directive "core.default_context".');
+                }
+            }
+            $profile = strtolower($profile);
+            if(!isset(self::$instances[$profile])) {
+                $class = Config::get('core.context_implementation', get_called_class());
+                self::$instances[$profile] = new $class($profile);
+                self::$instances[$profile]->initialize();
+            }
+            return self::$instances[$profile];
+        } catch(\Exception $e) {
+            AgaviException::render($e);
+        }
+    }
 	
-	/**
-	 * Retrieve the LoggerManager
-	 *
-	 * @return     LoggerManager The current LoggerManager implementation
-	 *                           instance.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getLoggerManager()
-	{
-		return $this->loggerManager;
-	}
+    /**
+     * Retrieve the LoggerManager
+     *
+     * @return     LoggerManager The current LoggerManager implementation
+     *                           instance.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getLoggerManager()
+    {
+        return $this->loggerManager;
+    }
 
-	/**
-	 * (re)Initialize the Context instance.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @author     Mike Vincent <mike@agavi.org>
-	 * @since      0.10.0
-	 */
-	public function initialize()
-	{
-		try {
-			include(ConfigCache::checkConfig(Config::get('core.config_dir') . '/factories.xml', $this->name));
-		} catch(\Exception $e) {
-			AgaviException::render($e, $this);
-		}
+    /**
+     * (re)Initialize the Context instance.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @author     David Zülke <dz@bitxtender.com>
+     * @author     Mike Vincent <mike@agavi.org>
+     * @since      0.10.0
+     */
+    public function initialize()
+    {
+        try {
+            include(ConfigCache::checkConfig(Config::get('core.config_dir') . '/factories.xml', $this->name));
+        } catch(\Exception $e) {
+            AgaviException::render($e, $this);
+        }
 		
-		register_shutdown_function(array($this, 'shutdown'));
-	}
+        register_shutdown_function(array($this, 'shutdown'));
+    }
 	
-	/**
-	 * Shut down this Context and all related factories.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function shutdown()
-	{
-		foreach($this->shutdownSequence as $object) {
-			$object->shutdown();
-		}
-	}
+    /**
+     * Shut down this Context and all related factories.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function shutdown()
+    {
+        foreach($this->shutdownSequence as $object) {
+            $object->shutdown();
+        }
+    }
 	
-	/**
-	 * Retrieve a Model implementation instance.
-	 *
-	 * @param      string $modelName A model name.
-	 * @param      string $moduleNameA module name, if the requested model is a module model,
-	 *                    or null for global models.
-	 * @param      array  $parameters An array of parameters to be passed to initialize() or
-	 *                    the constructor.
-	 *
-	 * @return     Model A Model implementation instance.
-	 *
-	 * @throws     AutoloadException if class is ultimately not found.
-     *
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getModel($modelName, $moduleName = null, array $parameters = null)
-	{
-		$origModelName = $modelName;
-		$modelName = Toolkit::canonicalName($modelName);
-		$class = str_replace('/', '_', $modelName) . 'Model';
-		$file = null;
-		$rc = null;
+    /**
+     * Retrieve a Model implementation instance.
+     *
+     * @param      string $modelName A model name.
+     * @param      string $moduleNameA module name, if the requested model is a module model,
+     *                    or null for global models.
+     * @param      array  $parameters An array of parameters to be passed to initialize() or
+     *                    the constructor.
+     *
+     * @return     Model A Model implementation instance.
+     *
+     * @throws     AutoloadException if class is ultimately not found.
+     *
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getModel($modelName, $moduleName = null, array $parameters = null)
+    {
+        $origModelName = $modelName;
+        $modelName = Toolkit::canonicalName($modelName);
+        $class = str_replace('/', '_', $modelName) . 'Model';
+        $file = null;
+        $rc = null;
 		
-		if($moduleName === null) {
-			// global model
-			// let's try to autoload that baby
-			if(!class_exists($class)) {
-				// it's not there. the hunt is on
-				$file = Config::get('core.model_dir') . '/' . $modelName . 'Model.class.php';
-			}
-		} else {
-			try {
-				$this->dispatcher->initializeModule($moduleName);
-			} catch(DisabledModuleException $e) {
-				// swallow, this will load the modules autoload but throw an exception 
-				// if the module is disabled.
-			}
-			// module model
-			// alternative name
-			$class = $moduleName . '_' . $class;
-			// let's try to autoload the baby
-			if(!class_exists($class)) {
-				// it's not there. the hunt is on
-				$file = Config::get('core.module_dir') . '/' . $moduleName . '/models/' . $modelName . 'Model.class.php';
-			}
-		}
+        if($moduleName === null) {
+            // global model
+            // let's try to autoload that baby
+            if(!class_exists($class)) {
+                // it's not there. the hunt is on
+                $file = Config::get('core.model_dir') . '/' . $modelName . 'Model.class.php';
+            }
+        } else {
+            try {
+                $this->dispatcher->initializeModule($moduleName);
+            } catch(DisabledModuleException $e) {
+                // swallow, this will load the modules autoload but throw an exception 
+                // if the module is disabled.
+            }
+            // module model
+            // alternative name
+            $class = $moduleName . '_' . $class;
+            // let's try to autoload the baby
+            if(!class_exists($class)) {
+                // it's not there. the hunt is on
+                $file = Config::get('core.module_dir') . '/' . $moduleName . '/models/' . $modelName . 'Model.class.php';
+            }
+        }
 
-		if(null !== $file && is_readable($file)) {
-			require($file);
-		}
+        if(null !== $file && is_readable($file)) {
+            require($file);
+        }
 
-		if(!class_exists($class)) {
-			// it's not there. 
-			throw new AgaviException(sprintf("Couldn't find class for Model %s", $origModelName));
-		}
+        if(!class_exists($class)) {
+            // it's not there. 
+            throw new AgaviException(sprintf("Couldn't find class for Model %s", $origModelName));
+        }
 		
-		// so if we're here, we found something, right? good.
+        // so if we're here, we found something, right? good.
 		
-		$rc = new \ReflectionClass($class);
+        $rc = new \ReflectionClass($class);
 		
-		if($rc->implementsInterface('Agavi\\Model\\SingletonModelInterface')) {
-			// it's a singleton
-			if(!isset($this->singletonModelInstances[$class])) {
-				// no instance yet, so we create one
+        if($rc->implementsInterface('Agavi\\Model\\SingletonModelInterface')) {
+            // it's a singleton
+            if(!isset($this->singletonModelInstances[$class])) {
+                // no instance yet, so we create one
 				
-				if($parameters === null || $rc->getConstructor() === null) {
-					// it has an initialize() method, or no parameters were given, so we don't hand arguments to the constructor
-					$this->singletonModelInstances[$class] = new $class();
-				} else {
-					// we use this approach so we can pass constructor params or if it doesn't have an initialize() method
-					$this->singletonModelInstances[$class] = $rc->newInstanceArgs($parameters);
-				}
-			}
-			$model = $this->singletonModelInstances[$class];
-		} else {
-			// create an instance
-			if($parameters === null || $rc->getConstructor() === null) {
-				// it has an initialize() method, or no parameters were given, so we don't hand arguments to the constructor
-				$model = new $class();
-			} else {
-				// we use this approach so we can pass constructor params or if it doesn't have an initialize() method
-				$model = $rc->newInstanceArgs($parameters);
-			}
-		}
+                if($parameters === null || $rc->getConstructor() === null) {
+                    // it has an initialize() method, or no parameters were given, so we don't hand arguments to the constructor
+                    $this->singletonModelInstances[$class] = new $class();
+                } else {
+                    // we use this approach so we can pass constructor params or if it doesn't have an initialize() method
+                    $this->singletonModelInstances[$class] = $rc->newInstanceArgs($parameters);
+                }
+            }
+            $model = $this->singletonModelInstances[$class];
+        } else {
+            // create an instance
+            if($parameters === null || $rc->getConstructor() === null) {
+                // it has an initialize() method, or no parameters were given, so we don't hand arguments to the constructor
+                $model = new $class();
+            } else {
+                // we use this approach so we can pass constructor params or if it doesn't have an initialize() method
+                $model = $rc->newInstanceArgs($parameters);
+            }
+        }
 		
-		if(is_callable(array($model, 'initialize'))) {
-			// pass the constructor params again. dual use for the win
-			$model->initialize($this, (array) $parameters);
-		}
+        if(is_callable(array($model, 'initialize'))) {
+            // pass the constructor params again. dual use for the win
+            $model->initialize($this, (array) $parameters);
+        }
 		
-		return $model;
-	}
+        return $model;
+    }
 
-	/**
-	 * Retrieve the name of this Context.
-	 *
-	 * @return     string A context name.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
+    /**
+     * Retrieve the name of this Context.
+     *
+     * @return     string A context name.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
 	
-	/**
-	 * Retrieve the request.
-	 *
-	 * @return     Request The current Request implementation instance.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @since      0.9.0
-	 */
-	public function getRequest()
-	{
-		return $this->request;
-	}
+    /**
+     * Retrieve the request.
+     *
+     * @return     Request The current Request implementation instance.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @since      0.9.0
+     */
+    public function getRequest()
+    {
+        return $this->request;
+    }
 
-	/**
-	 * Retrieve the routing.
-	 *
-	 * @return     Routing The current Routing implementation instance.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getRouting()
-	{
-		return $this->routing;
-	}
+    /**
+     * Retrieve the routing.
+     *
+     * @return     Routing The current Routing implementation instance.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getRouting()
+    {
+        return $this->routing;
+    }
 
-	/**
-	 * Retrieve the storage.
-	 *
-	 * @return     Storage The current Storage implementation instance.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @since      0.9.0
-	 */
-	public function getStorage()
-	{
-		return $this->storage;
-	}
+    /**
+     * Retrieve the storage.
+     *
+     * @return     Storage The current Storage implementation instance.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @since      0.9.0
+     */
+    public function getStorage()
+    {
+        return $this->storage;
+    }
 
-	/**
-	 * Retrieve the translation manager.
-	 *
-	 * @return     TranslationManager The current TranslationManager
-	 *                                     implementation instance.
-	 *
-	 * @author     Dominik del Bondio <ddb@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getTranslationManager()
-	{
-		return $this->translationManager;
-	}
+    /**
+     * Retrieve the translation manager.
+     *
+     * @return     TranslationManager The current TranslationManager
+     *                                     implementation instance.
+     *
+     * @author     Dominik del Bondio <ddb@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getTranslationManager()
+    {
+        return $this->translationManager;
+    }
 
-	/**
-	 * Retrieve the user.
-	 *
-	 * @return     User The current User implementation instance.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @since      0.9.0
-	 */
-	public function getUser()
-	{
-		return $this->user;
-	}
+    /**
+     * Retrieve the user.
+     *
+     * @return     User The current User implementation instance.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @since      0.9.0
+     */
+    public function getUser()
+    {
+        return $this->user;
+    }
 }
 
 ?>
\ No newline at end of file

src/database/DatabaseManager.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 	 * Retrieve the database connection associated with this Database
 	 * implementation.
 	 *
-	 * @param      string $nme A database name.
+	 * @param      string $name A database name.
 	 *
 	 * @return     mixed A Database instance.
 	 *

Spacing +4 added lines, -4 removed lines

@@ -83,11 +83,11 @@ 
 	 */
 	public function getDatabase($name = null)
 	{
-		if($name === null) {
+		if ($name === null) {
 			$name = $this->defaultDatabaseName;
 		}
 		
-		if(isset($this->databases[$name])) {
+		if (isset($this->databases[$name])) {
 			return $this->databases[$name];
 		}
 
@@ -156,7 +156,7 @@ 
 	public function startup()
 	{
 		/** @var Database $database */
-		foreach($this->databases as $database) {
+		foreach ($this->databases as $database) {
 			$database->startup();
 		}
 	}
@@ -173,7 +173,7 @@ 
 	public function shutdown()
 	{
 		// loop through databases and shutdown connections
-		foreach($this->databases as $database) {
+		foreach ($this->databases as $database) {
 			$database->shutdown();
 		}
 	}

Indentation +126 added lines, -126 removed lines

@@ -39,144 +39,144 @@
  */
 class DatabaseManager
 {
-	/**
-	 * @var        string The name of the default database.
-	 */
-	protected $defaultDatabaseName = null;
+    /**
+     * @var        string The name of the default database.
+     */
+    protected $defaultDatabaseName = null;
 	
-	/**
-	 * @var        array An array of AgaviDatabases.
-	 */
-	protected $databases = array();
+    /**
+     * @var        array An array of AgaviDatabases.
+     */
+    protected $databases = array();
 
-	/**
-	 * @var        Context A Context instance.
-	 */
-	protected $context = null;
+    /**
+     * @var        Context A Context instance.
+     */
+    protected $context = null;
 
-	/**
-	 * Retrieve the current application context.
-	 *
-	 * @return     Context The current Context instance.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public final function getContext()
-	{
-		return $this->context;
-	}
+    /**
+     * Retrieve the current application context.
+     *
+     * @return     Context The current Context instance.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public final function getContext()
+    {
+        return $this->context;
+    }
 
-	/**
-	 * Retrieve the database connection associated with this Database
-	 * implementation.
-	 *
-	 * @param      string $nme A database name.
-	 *
-	 * @return     mixed A Database instance.
-	 *
-	 * @throws     DatabaseException If the requested database name does not exist.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @since      0.9.0
-	 */
-	public function getDatabase($name = null)
-	{
-		if($name === null) {
-			$name = $this->defaultDatabaseName;
-		}
+    /**
+     * Retrieve the database connection associated with this Database
+     * implementation.
+     *
+     * @param      string $nme A database name.
+     *
+     * @return     mixed A Database instance.
+     *
+     * @throws     DatabaseException If the requested database name does not exist.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @since      0.9.0
+     */
+    public function getDatabase($name = null)
+    {
+        if($name === null) {
+            $name = $this->defaultDatabaseName;
+        }
 		
-		if(isset($this->databases[$name])) {
-			return $this->databases[$name];
-		}
+        if(isset($this->databases[$name])) {
+            return $this->databases[$name];
+        }
 
-		// nonexistent database name
-		$error = 'Database "%s" does not exist';
-		$error = sprintf($error, $name);
-		throw new DatabaseException($error);
-	}
+        // nonexistent database name
+        $error = 'Database "%s" does not exist';
+        $error = sprintf($error, $name);
+        throw new DatabaseException($error);
+    }
 	
-	/**
-	 * Retrieve the name of the given database instance.
-	 *
-	 * @param      Database $database The database to fetch the name of.
-	 *
-	 * @return     string The name of the database, or false if it was not found.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getDatabaseName(Database $database)
-	{
-		return array_search($database, $this->databases, true);
-	}
+    /**
+     * Retrieve the name of the given database instance.
+     *
+     * @param      Database $database The database to fetch the name of.
+     *
+     * @return     string The name of the database, or false if it was not found.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getDatabaseName(Database $database)
+    {
+        return array_search($database, $this->databases, true);
+    }
 
-	/**
-	 * Returns the name of the default database.
-	 *
-	 * @return     string The name of the default database.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function getDefaultDatabaseName()
-	{
-		return $this->defaultDatabaseName;
-	}
+    /**
+     * Returns the name of the default database.
+     *
+     * @return     string The name of the default database.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function getDefaultDatabaseName()
+    {
+        return $this->defaultDatabaseName;
+    }
 
-	/**
-	 * Initialize this DatabaseManager.
-	 *
-	 * @param      Context $context    A Context instance.
-	 * @param      array   $parameters An array of initialization parameters.
-	 *
-	 * @throws     InitializationException If an error occurs while initializing this DatabaseManager.
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @since      0.9.0
-	 */
-	public function initialize(Context $context, array $parameters = array())
-	{
-		$this->context = $context;
+    /**
+     * Initialize this DatabaseManager.
+     *
+     * @param      Context $context    A Context instance.
+     * @param      array   $parameters An array of initialization parameters.
+     *
+     * @throws     InitializationException If an error occurs while initializing this DatabaseManager.
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @since      0.9.0
+     */
+    public function initialize(Context $context, array $parameters = array())
+    {
+        $this->context = $context;
 
-		// load database configuration
-		require(ConfigCache::checkConfig(Config::get('core.config_dir') . '/databases.xml'));
-	}
+        // load database configuration
+        require(ConfigCache::checkConfig(Config::get('core.config_dir') . '/databases.xml'));
+    }
 
-	/**
-	 * Do any necessary startup work after initialization.
-	 *
-	 * This method is not called directly after initialize().
-	 *
-	 * @author     David Zülke <dz@bitxtender.com>
-	 * @since      0.11.0
-	 */
-	public function startup()
-	{
-		/** @var Database $database */
-		foreach($this->databases as $database) {
-			$database->startup();
-		}
-	}
+    /**
+     * Do any necessary startup work after initialization.
+     *
+     * This method is not called directly after initialize().
+     *
+     * @author     David Zülke <dz@bitxtender.com>
+     * @since      0.11.0
+     */
+    public function startup()
+    {
+        /** @var Database $database */
+        foreach($this->databases as $database) {
+            $database->startup();
+        }
+    }
 
-	/**
-	 * Execute the shutdown procedure.
-	 *
-	 * @throws     <b>AgaviDatabaseException</b> If an error occurs while shutting
-	 *                                           down this DatabaseManager.
-	 *
-	 * @author     Sean Kerr <skerr@mojavi.org>
-	 * @since      0.9.0
-	 */
-	public function shutdown()
-	{
-		// loop through databases and shutdown connections
-		foreach($this->databases as $database) {
-			$database->shutdown();
-		}
-	}
+    /**
+     * Execute the shutdown procedure.
+     *
+     * @throws     <b>AgaviDatabaseException</b> If an error occurs while shutting
+     *                                           down this DatabaseManager.
+     *
+     * @author     Sean Kerr <skerr@mojavi.org>
+     * @since      0.9.0
+     */
+    public function shutdown()
+    {
+        // loop through databases and shutdown connections
+        foreach($this->databases as $database) {
+            $database->shutdown();
+        }
+    }
 }
 
 ?>
\ No newline at end of file